diff --git a/hub/calendar.php b/hub/calendar.php
index de9c3a7..63aea05 100644
--- a/hub/calendar.php
+++ b/hub/calendar.php
@@ -117,18 +117,18 @@ print "<!-- max_episode_number is $max_episode_number -->\n";
 // --------------------------------------------
 // Get the number of shows in the Reserve Pool.
 
-$query = mysqli_query($connection, "SELECT COUNT(*) as count_reserve_queue FROM reservations WHERE status = 'RESERVE_SHOW_SUBMITTED' AND ip = '127.0.0.1';");
+$query = mysqli_query($connection, "SELECT COUNT(*) as count_reserve_pool FROM reservations WHERE status = 'RESERVE_SHOW_SUBMITTED' AND ip = '127.0.0.1';");
 $response_array = mysqli_fetch_row($query);
-$count_reserve_queue = $response_array[0];
-print "<!-- count_reserve_queue is $count_reserve_queue -->\n";
+$count_reserve_pool = $response_array[0];
+print "<!-- count_reserve_pool is $count_reserve_pool -->\n";
 
 // --------------------------------------------
 // Get the number of shows in the Reserve Pool yet to be processed.
 
-$query = mysqli_query($connection, "SELECT COUNT(*) as count_reserve_queue_unprocessed FROM reservations WHERE status = 'RESERVE_SHOW_SUBMITTED' AND ip != '127.0.0.1';");
+$query = mysqli_query($connection, "SELECT COUNT(*) as count_reserve_pool_unprocessed FROM reservations WHERE status = 'RESERVE_SHOW_SUBMITTED' AND ip != '127.0.0.1';");
 $response_array = mysqli_fetch_row($query);
-$count_reserve_queue_unprocessed = $response_array[0];
-print "<!-- count_reserve_queue_unprocessed is $count_reserve_queue_unprocessed -->\n";
+$count_reserve_pool_unprocessed = $response_array[0];
+print "<!-- count_reserve_pool_unprocessed is $count_reserve_pool_unprocessed -->\n";
 
 // --------------------------------------------
 // Populate array with future shows and reservations
@@ -314,13 +314,13 @@ There are only <strong><?php echo "${days_to_wait}"; ?></strong> days to wait un
   <li>When the queue is filling up then leave some slots free for new contributors.</li>
   <li>Post non urgent shows into the first empty week.</li>
   <li>If you are uploading a series of shows then post them one every two weeks.</li>
-  <li>If you have a non urgent show that is timeless, then add it to the <a href="<?php echo $referrerurl ?>about.html#reserve_queue">Reserve Pool</a>.</li>
+  <li>If you have a non urgent show that is timeless, then add it to the <a href="<?php echo $referrerurl ?>about.html#reserve_pool">Reserve Pool</a>.</li>
 </ol>  
 
-<h2 id="reserve_queue">Add to the Reserve Pool ?</h2>
+<h2 id="reserve_pool">Add to the Reserve Pool ?</h2>
 
 <p>
-<a aria-label="Post to the Reserve Pool" href="<?php echo "${hubBaseurl}"; ?>request.php?id=9999">Post your show to the <strong>Reserve Pool</strong></a> if you don't care when it will be released. <small><a aria-label="Help on the Reserve Pool" href="<?php echo "${referrerurl}"; ?>about.html#reserve_queue";">&#9432;</a></small>
+<a aria-label="Post to the Reserve Pool" href="<?php echo "${hubBaseurl}"; ?>request.php?id=9999">Post your show to the <strong>Reserve Pool</strong></a> if you don't care when it will be released. <small><a aria-label="Help on the Reserve Pool" href="<?php echo "${referrerurl}"; ?>about.html#reserve_pool";">&#9432;</a></small>
 </p>
   
 <h2 id="current_schedule">Select a date in the current schedule ?</h2>
@@ -384,7 +384,7 @@ while ( $slot <= $max_episode_number) {
 }
 ?>
 
-<h3 id="reserve_queue_overview">Reserve Pool Overview</h3>
+<h3 id="reserve_pool_overview">Reserve Pool Overview</h3>
 <pre>
 <?php
 include 'reserve.txt';
diff --git a/hub/request_confirm.php b/hub/request_confirm.php
index 37a0842..5b037c3 100644
--- a/hub/request_confirm.php
+++ b/hub/request_confirm.php
@@ -304,9 +304,12 @@ include 'header.php';
     <p>
     Thank you for your submission. A confirmation email has been sent to <em><?php echo $email; ?></em>. Please copy and paste the link into your browser to confirm your email address, and upload your show media.
     </p>
-    <p>You need to <em>open</em> the link within <strong>15 minutes</strong> or the temporary lock will be released. Once you open the link, you can fill in the information at your leisure.</p>
+    <p>You need to <em>open</em> the link within <strong>15 minutes</strong> or the temporary lock will be released. 
+    Once you open the link, you have a maximum of 4 Hours to fill in the information.</p>
     <p>The email is sent from the address <strong>robot@hobbypublicradio.com</strong>, and should be in your inbox by the time you read this.</p>
-    <p>If it is not there by now, then please <strong>spam</strong> folder. We have had reports that sometimes gmail and hotmail consider the messages as spam. Please consider <a href="https://onlinegroups.net/blog/2014/02/25/how-to-whitelist-an-email-address/" target="_blank">whitelisting</a> the email address <em>robot@hobbypublicradio.com</em>.</p>
+    <p>If it is not there by now, then please <strong>spam</strong> folder. 
+    We have had reports that sometimes gmail and hotmail consider the messages as spam. 
+    Please consider <a href="https://onlinegroups.net/blog/2014/02/25/how-to-whitelist-an-email-address/" target="_blank">whitelisting</a> the email address <em>robot@hobbypublicradio.com</em>.</p>
     <p>
     <img src="images/gmail-spam.png" alt="gmail is blocking us" />
     </p>
@@ -318,7 +321,7 @@ include 'header.php';
     </p>
     <pre>
     <pre>
-    <?php print date('Y-m-d\TH:i:s') . "\t" . getUserIP() . "\t" . $db_key . "\t" . $_SERVER["HTTP_USER_AGENT"]; ?>
+    <?php print date('Y-m-d\TH:i:s') . "\n" . getUserIP() . "\n" . $db_key . "\t" . $_SERVER["HTTP_USER_AGENT"]; ?>
     </pre>
   </article>
 <?php
diff --git a/hub/upload.php b/hub/upload.php
index a98bb55..90d3ddd 100644
--- a/hub/upload.php
+++ b/hub/upload.php
@@ -148,17 +148,18 @@ include 'header.php';
   }
   ?>
   <p>
-  You can fill in information about yourself and your show below. Please see the <a href="request_a_slot.php">help</a> page for more information.
+  You can fill in information about yourself and your show below.
+  Please see the "<em><a href="<?php echo "${referrerurl}contribute.html#uploading_an_episode"; ?>" target="_blank">Uploading an Episode help page</a></em>" for more information.
   </p>
   <h2><?php echo $status ?></h2>
   <form method="POST" action="upload_confirm.php" enctype="multipart/form-data">
   <table class="upload">
     <tr>
-      <td>Host Email (<a href="<?php echo "${referrerurl}about.html#email"; ?>" target="_blank">?</a>):</td>
+      <td>Host Email (<a href="<?php echo "${referrerurl}contribute.html#profile_email"; ?>" target="_blank">?</a>):</td>
       <td><?php echo $email;?></td>
     </tr>
     <tr>
-      <td>Image: (<a href="<?php echo "${referrerurl}about.html#image"; ?>" target="_blank">?</a>)</td>
+      <td>Image: (<a href="<?php echo "${referrerurl}contribute.html#profile_image"; ?>" target="_blank">?</a>)</td>
       <td>
       <?php 
       echo "<img src=\"$image_url\" alt=\"host image\" /><br /><small><em>";
@@ -174,25 +175,21 @@ include 'header.php';
       </td>
     </tr>
     <tr>
-      <td><strong>Name/Handle: (<a href="<?php echo "${baseurl}about.html#Name_Handle"; ?>" target="_blank">?</a>)</strong></td>
+      <td><strong>Name/Handle: (<a href="<?php echo "${baseurl}contribute.html#profile_name_handle"; ?>" target="_blank">?</a>)</strong></td>
       <td><input required type="text" name="host_name" size="40" maxlength="40" placeholder="Enter the name you wish to be know as on HPR" value="<?php echo $host?>"></td>
     </tr>
     <tr>
-      <td><strong>Your Default license: (<a href="<?php echo "${baseurl}about.html#Default_license"; ?>" target="_blank">?</a>)</strong></td>
+      <td><strong>Your Default license: (<a href="<?php echo "${baseurl}contribute.html#profile_default_license"; ?>" target="_blank">?</a>)</strong></td>
       <td>
       <select name="host_license">
         <option value="CC-0" <?php if($license == "CC-0") echo "selected"; ?>>CC-Zero/Public Domain (CC-0)
         <option value="CC-BY" <?php if($license == "CC-BY") echo "selected"; ?>>Attribution (CC-BY)
         <option value="CC-BY-SA" <?php if($license == "CC-BY-SA") echo "selected"; ?>>Attribution-ShareAlike (CC-BY-SA)
-        <option value="CC-BY-ND" <?php if($license == "CC-BY-ND") echo "selected"; ?>>Attribution-NoDerivs (CC-BY-ND)
-        <option value="CC-BY-NC" <?php if($license == "CC-BY-NC") echo "selected"; ?>>Attribution-NonCommercial (CC-BY-NC)
-        <option value="CC-BY-NC-SA" <?php if($license == "CC-BY-NC-SA") echo "selected"; ?>>Attribution-NonCommercial-ShareAlike (CC-BY-NC-SA)
-        <option value="CC-BY-NC-ND" <?php if($license == "CC-BY-NC-ND") echo "selected"; ?>>Attribution-NonCommercial-NoDerivs (CC-BY-NC-ND)
       </select>
       </td>
     </tr>
     <tr>
-      <td>Profile: (<a href="<?php echo "${baseurl}about.html#Profile"; ?>" target="_blank">?</a>)</td>
+      <td>Profile: (<a href="<?php echo "${baseurl}contribute.html#profile"; ?>" target="_blank">?</a>)</td>
       <td>
         <noscript>
           <textarea name="host_profile" maxlength="2000" rows="10" cols="50" placeholder="Enter some text about yourself with links to your blog or other online presence."><?php echo htmlspecialchars($profile) ?></textarea>
@@ -201,18 +198,20 @@ include 'header.php';
       </td>
     </tr>
   </table>
+  
+  
   <h2>Please fill in some information about this episode</h2>
   <table class="upload">
     <tr>
-      <td><strong>Title(*) (<a href="<?php echo "${referrerurl}about.html#Title"; ?>" target="_blank">?</a>):</strong></td>
+      <td><strong>Title(*) (<a href="<?php echo "${referrerurl}contribute.html#episode_title"; ?>" target="_blank">?</a>):</strong></td>
       <td><input required type="text" name="title" size="50" maxlength="100" placeholder="Enter a short descriptive title for your show."></td>
     </tr>
     <tr>
-      <td><strong>Summary(*) (<a href="<?php echo "${referrerurl}about.html#Short_Summary"; ?>" target="_blank">?</a>):</strong></td>
+      <td><strong>Summary(*) (<a href="<?php echo "${referrerurl}contribute.html#episode_short_summary"; ?>" target="_blank">?</a>):</strong></td>
       <td><input required type="text" name="summary" size="70" maxlength="100" placeholder="This is a short 100 character summary of what your show is about."></td>
     </tr>
     <tr>
-      <td><strong>Explicit: (<a href="<?php echo "${referrerurl}about.html#Explicit"; ?>" target="_blank">?</a>)</strong></td>
+      <td><strong>Explicit: (<a href="<?php echo "${referrerurl}contribute.html#episode_explicit"; ?>" target="_blank">?</a>)</strong></td>
       <td>
         Is the show <em>Explicit</em> ?:
         <input required type="radio" name="explicit" value="Yes">Yes 
@@ -221,14 +220,11 @@ include 'header.php';
       </td>
     </tr>
     <tr>
-      <td><strong>License: (<a href="<?php echo "${referrerurl}about.html#License"; ?>" target="_blank">?</a>)</strong></td>
+      <td><strong>License: (<a href="<?php echo "${referrerurl}contribute.html#episode_license"; ?>" target="_blank">?</a>)</strong></td>
       <td>
         <select name="license">
             <option value="CC-BY-SA" selected>CC-BY-SA</option>
-            <option value="CC-BY-NC-SA" >CC-BY-NC-SA</option>
-            <option value="CC-BY-NC-ND" >CC-BY-NC-ND</option>
             <option value="CC-0" >CC-0</option>
-            <option value="CC-BY-NC" >CC-BY-NC</option>
             <option value="CC-BY" >CC-BY</option>
             <option value="Other" >Other</option>
         </select>
@@ -236,7 +232,7 @@ include 'header.php';
       </td>
     </tr>
     <tr>
-      <td><strong>Notes(*) (<a href="<?php echo "${referrerurl}about.html#show_notes"; ?>" target="_blank">?</a>):</strong></td>
+      <td><strong>Notes(*) (<a href="<?php echo "${referrerurl}contribute.html#episode_show_notes"; ?>" target="_blank">?</a>):</strong></td>
       <td>
         <noscript>
           <textarea required name="notes" maxlength="40000" rows="20" cols="70" placeholder="Please add your show notes here." ></textarea>
@@ -246,7 +242,7 @@ include 'header.php';
     </tr>
     <noscript>
       <tr>
-        <td>Format: (<a href="<?php echo "${referrerurl}about.html#shownotes_format"; ?>" target="_blank">?</a>)</td>
+        <td>Format: (<a href="<?php echo "${referrerurl}contribute.html#shownotes_format"; ?>" target="_blank">?</a>)</td>
         <td>
           <small>What format if any did you just use in the show notes above ?</small><br />
           <select name="shownotes_format">
@@ -261,7 +257,7 @@ include 'header.php';
       </tr>
     </noscript>
     <tr>
-      <td>Series: (<a href="<?php echo "${referrerurl}about.html#series"; ?>" target="_blank">?</a>)</td>
+      <td>Series: (<a href="<?php echo "${referrerurl}contribute.html#episode_series"; ?>" target="_blank">?</a>)</td>
       <td>
         <?php
         $result = mysqli_query($connection, "SELECT id, name FROM miniseries WHERE private=0 ORDER BY name ASC");
@@ -275,22 +271,22 @@ include 'header.php';
       </td>
     </tr>
     <tr>
-      <td>Tags: (<a href="<?php echo "${referrerurl}about.html#tags"; ?>" target="_blank">?</a>)</td>
+      <td>Tags: (<a href="<?php echo "${referrerurl}contribute.html#episode_tags"; ?>" target="_blank">?</a>)</td>
       <td><input required type="text" name="tags" size="70" maxlength="100" placeholder="Add a list of comma separated tags." /><br />
       Add a list of <strong>comma separated</strong> tags.<br />
       If you can provide tags for your show that would be appreciated; you are certainly the best judge of what makes good tags, but if not then a volunteer will add them later.
       </td>
     </tr>
     <tr>
-      <td><strong>Upload Method: (<a href="<?php echo "${referrerurl}about.html#upload_method"; ?>" target="_blank">?</a>)</strong></td>
+      <td><strong>Upload Method: (<a href="<?php echo "${referrerurl}contribute.html#episode_upload_method"; ?>" target="_blank">?</a>)</strong></td>
       <td>
         <em>You have the choice of the following upload options:</em> <br />
         <p>
-        <strong>1. Upload now</strong> via this browser: (<a href="<?php echo "${referrerurl}about.html#browser"; ?>" target="_blank">?</a>)<br />
+        <strong>1. Upload now</strong> via this browser: (<a href="<?php echo "${referrerurl}contribute.html#episode_upload_method_browser"; ?>" target="_blank">?</a>)<br />
         <input type="file" multiple="multiple" name="media_files[]" title="select if using the http upload option" />
         </p>
         <p>
-        <strong>2. Provide a url</strong> we we can directly download it from: (<a href="<?php echo "${referrerurl}about.html#url"; ?>" target="_blank">?</a>)<br />
+        <strong>2. Provide a url</strong> we we can directly download it from: (<a href="<?php echo "${referrerurl}contribute.html#episode_upload_method_url"; ?>" target="_blank">?</a>)<br />
         This must be accessable using a curl or wget command.<br />
         Please avoid services that require login or downloading via a browser.<br />
         <input type="url" size="30"  name="url" placeholder="https://example.com/hpr9999.flac">

Host Email (" target="_blank">?):	Host Email (" target="_blank">?):
Image: (" target="_blank">?)	Image: (" target="_blank">?)	"; @@ -174,25 +175,21 @@ include 'header.php';
Name/Handle: (" target="_blank">?)	Name/Handle: (" target="_blank">?)
Your Default license: (" target="_blank">?)	Your Default license: (" target="_blank">?)
Profile: (" target="_blank">?)	Profile: (" target="_blank">?)
Series: (" target="_blank">?)	Series: (" target="_blank">?)
Tags: (" target="_blank">?)	Tags: (" target="_blank">?)	Add a list of comma separated tags. If you can provide tags for your show that would be appreciated; you are certainly the best judge of what makes good tags, but if not then a volunteer will add them later.
Upload Method: (" target="_blank">?)	Upload Method: (" target="_blank">?)	You have the choice of the following upload options: - 1. Upload now via this browser: (" target="_blank">?) + 1. Upload now via this browser: (" target="_blank">?) - 2. Provide a url we we can directly download it from: (" target="_blank">?) + 2. Provide a url we we can directly download it from: (" target="_blank">?) This must be accessable using a curl or wget command. Please avoid services that require login or downloading via a browser.