diff --git a/CHANGELOG.md b/CHANGELOG.md
index d41b596..a70926e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# v2.1.6
+## 09/20/2020
+
+1. [](#new)
+    * Added podcast episode number to feed.
+
+2. [](#improved)
+    * Updated News category options
+
+3. [](#bugfix)
+    * Updated field name to disable page media upload field on channels, series, and episodes.
+
 # v2.1.5
 ## 01/28/2020
 
diff --git a/blueprints.yaml b/blueprints.yaml
index 096db72..523724f 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Podcast
-version: 2.1.5
+version: 2.1.6
 description: Creates Podcast page types and related podcast RSS feeds
 icon: microphone
 author:
diff --git a/blueprints/podcast-channel.yaml b/blueprints/podcast-channel.yaml
index aaa9077..71c92d2 100644
--- a/blueprints/podcast-channel.yaml
+++ b/blueprints/podcast-channel.yaml
@@ -14,7 +14,7 @@ form:
           ordering@: 0
           title: Podcast Page Content
           fields:
-            uploads:
+            header.media_order:
               unset@: true
             header.title:
               type: text
diff --git a/blueprints/podcast-episode.yaml b/blueprints/podcast-episode.yaml
index dadc142..99261dc 100644
--- a/blueprints/podcast-episode.yaml
+++ b/blueprints/podcast-episode.yaml
@@ -11,19 +11,23 @@ form:
       fields:
         content:
           type: tab
-          ordering@: 0
           title: Podcast
           fields:
-            uploads:
-              unset@: true
             header.title:
-              ordering@: 0
+              ordering@: 1
               type: text
               label: Episode Title
             header.subtitle:
-              ordering@: 1
+              ordering@: 2
               type: text
               label: Episode subtitle
+            header.podcast.episode_number:
+              ordering@: 3
+              type: text
+              label: Episode number
+              size: x-small
+            header.media_order:
+              unset@: true
         podcastAudio:
             type: tab
             title: Podcast Audio
diff --git a/blueprints/podcast-series.yaml b/blueprints/podcast-series.yaml
index 59290bc..2eec546 100644
--- a/blueprints/podcast-series.yaml
+++ b/blueprints/podcast-series.yaml
@@ -14,7 +14,7 @@ form:
           ordering@: 0
           title: Podcast Series Content
           fields:
-            uploads:
+            header.media_order:
               unset@: true
             header.title:
               type: text
diff --git a/data/iTunesCategories.yaml b/data/iTunesCategories.yaml
index b82da72..ab79135 100644
--- a/data/iTunesCategories.yaml
+++ b/data/iTunesCategories.yaml
@@ -39,7 +39,14 @@ Kids & Family:
   - Kids & Family
 Music:
   - Music
-News & Politics:
+News:
+  - Business News
+  - Daily News
+  - Entertainment News
+  - News Commentary
+  - Politics
+  - Sports News
+  - Tech News
 Religion & Spirituality:
   - Buddhism
   - Christianity
diff --git a/templates/feed.rss.twig b/templates/feed.rss.twig
index 2fddfcd..2d0c1b2 100644
--- a/templates/feed.rss.twig
+++ b/templates/feed.rss.twig
@@ -9,7 +9,7 @@
 <rss version="2.0" xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd">
 <channel>
 <title>{{ channel.title }}</title>
-<link>{{ page.url(true) }}</link>
+<link>{{ header.podcast.link }}</link>
 <language>{{ channel.header.podcast.channelLanguage }}</language>
 <copyright>{{ channel.header.podcast.copyright }}</copyright>
 <itunes:subtitle>{{ channel.header.podcast.itunes.subtitle }}</itunes:subtitle>
@@ -17,33 +17,37 @@
 <itunes:summary>{{ (channel.content ? channel.content : channel.header.podcast.description)|striptags }}</itunes:summary>
 <description>{{ channel.header.podcast.description|striptags }}</description>
 <itunes:owner>
-<itunes:name>{{ channel.header.podcast.itunes.owner.name }}</itunes:name>
-<itunes:email>{{ channel.header.podcast.itunes.owner.email }}</itunes:email>
+    <itunes:name>{{ channel.header.podcast.itunes.owner.name }}</itunes:name>
+    <itunes:email>{{ channel.header.podcast.itunes.owner.email }}</itunes:email>
 </itunes:owner>
 <itunes:image href="{{ base_url_absolute}}/{{ ((channel.header.podcast.itunes.image)|first.path) }}"/>
 <itunes:category text="{{ channel.header.podcast.itunes.category }}">
-<itunes:category text="{{ channel.header.podcast.itunes.subcategory }}"/>
+    <itunes:category text="{{ channel.header.podcast.itunes.subcategory }}"/>
 </itunes:category>
 <itunes:explicit>{{ channel.header.podcast.itunes.explicit }}</itunes:explicit>
 {% set episodes = page.collection({ 'items': '@self.descendants', 'order': {'by': 'date', 'dir': 'desc'}} ).ofType('podcast-episode') %}
 {% for episode in episodes %}
 {% if episode.header.podcast.audio.meta %}
 <item>
-<title>{{episode.title}}</title>
-<itunes:author>{{ episode.header.podcast.itunes.author }}</itunes:author>
-<itunes:subtitle>{{ episdoe.header.podcast.subtitle }}</itunes:subtitle>
-<itunes:summary>{{episode.content|striptags|truncate(120, true, " ", "&#x2026;")}}</itunes:summary>
-<itunes:image href="{{base_url_absolute}}/{{ (episode.header.podcast.itunes.image)|first.path|absolute_url }}"/>
-{% if (episode.header.podcast.audio.remote) %}
-<enclosure length="{{episode.header.podcast.audio.meta.enclosure_length}}" type="{{episode.header.podcast.audio.meta.type}}" url="{{episode.header.podcast.audio.remote}}"/>
-<guid>{{episode.header.podcast.audio.remote}}</guid>
-{% else %}
-<enclosure length="{{episode.header.podcast.audio.meta.enclosure_length}}" type="{{episode.header.podcast.audio.meta.type}}" url="{{base_url_absolute}}/{{episode.header.podcast.audio.meta.guid|absolute_url}}"/>
-<guid>{{base_url_absolute}}/{{episode.header.podcast.audio.meta.guid|absolute_url}}</guid>
-{% endif %}
-<pubDate>{{ episode.header.publish_date ? episode.header.publish_date|date('r') : episode.date|date('r')}}</pubDate>
-<itunes:duration>{{episode.header.podcast.audio.meta.duration}}</itunes:duration>
-<itunes:explicit>{{episode.header.podcast.itunes.explicit}}</itunes:explicit>
+    <title>{{ episode.title }}</title>
+    <link>{{ episode.url(true) }}</link>
+    {% if episode.header.podcast.episode_number %}
+    <itunes:episode>{{ episode.header.podcast.episode_number }}</itunes:episode>
+    {% endif %}
+    <itunes:author>{{ episode.header.podcast.itunes.author }}</itunes:author>
+    <itunes:subtitle>{{ episdoe.header.podcast.subtitle }}</itunes:subtitle>
+    <itunes:summary>{{episode.content|striptags|truncate(120, true, " ", "&#x2026;")}}</itunes:summary>
+    <itunes:image href="{{base_url_absolute}}/{{ (episode.header.podcast.itunes.image)|first.path|absolute_url }}"/>
+    {% if (episode.header.podcast.audio.remote) %}
+    <enclosure length="{{episode.header.podcast.audio.meta.enclosure_length}}" type="{{episode.header.podcast.audio.meta.type}}" url="{{episode.header.podcast.audio.remote}}"/>
+    <guid>{{episode.header.podcast.audio.remote}}</guid>
+    {% else %}
+    <enclosure length="{{episode.header.podcast.audio.meta.enclosure_length}}" type="{{episode.header.podcast.audio.meta.type}}" url="{{base_url_absolute}}/{{episode.header.podcast.audio.meta.guid|absolute_url}}"/>
+    <guid>{{base_url_absolute}}/{{episode.header.podcast.audio.meta.guid|absolute_url}}</guid>
+    {% endif %}
+    <pubDate>{{ episode.header.publish_date ? episode.header.publish_date|date('r') : episode.date|date('r')}}</pubDate>
+    <itunes:duration>{{episode.header.podcast.audio.meta.duration}}</itunes:duration>
+    <itunes:explicit>{{episode.header.podcast.itunes.explicit}}</itunes:explicit>
 </item>
 {% endif %}
 {% endfor %}