diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index 0d7a34f7f..2cca81ac2 100644
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@@ -436,7 +436,7 @@ class PlaylistController extends Zend_Controller_Action
 
         try {
             $obj = $this->getPlaylist($type);
-            $obj->setName($name);
+            $obj->setName(trim($name));
             $obj->setDescription($description);
             $this->view->description = $description;
             $this->view->playlistName = $name;
diff --git a/airtime_mvc/application/forms/AddShowWhen.php b/airtime_mvc/application/forms/AddShowWhen.php
index ffad27fea..86018ff1a 100644
--- a/airtime_mvc/application/forms/AddShowWhen.php
+++ b/airtime_mvc/application/forms/AddShowWhen.php
@@ -243,7 +243,9 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
                             $minutes = "0";
                             $durationToAdd = "PT".$hours."H";
                         }
-
+                        
+                        if (empty($formData["add_show_rebroadcast_date_absolute_".$i])) break;
+                        
                         $abs_rebroadcast_start = $formData["add_show_rebroadcast_date_absolute_".$i]." ".
                                                  $formData["add_show_rebroadcast_time_absolute_".$i];
                         $rebroadcastShowStart = new DateTime($abs_rebroadcast_start);
diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index fa305a90a..4d62b8329 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -229,10 +229,17 @@ SQL;
             $formatter = new LengthFormatter($offset_cliplength);
             $row['offset'] = $formatter->format();
 
-            //format the fades in format 00(.000000)
+            //format the fades in format 00(.0)
             $fades = $this->getFadeInfo($row['position']);
             $row['fadein'] = $fades[0];
             $row['fadeout'] = $fades[1];
+            
+            // format the cues in format 00:00:00(.0)
+            // we need to add the '.0' for cues and not fades
+            // because propel takes care of this for us
+            // (we use propel to fetch the fades)
+            $row['cuein'] = str_pad(substr($row['cuein'], 0, 10), 10, '.0');
+            $row['cueout'] = str_pad(substr($row['cueout'], 0, 10), 10, '.0');
 
             //format original length
             $formatter = new LengthFormatter($row['orig_length']);
@@ -611,9 +618,10 @@ SQL;
 
 
 
-        #Propel returns values in form 00.000000 format which is for only seconds.
-        $fadeIn = $row->getDbFadein();
-        $fadeOut = $row->getDbFadeout();
+        //Propel returns values in form 00.000000 format which is for only seconds.
+        //We only want to display 1 decimal
+        $fadeIn = substr($row->getDbFadein(), 0, 4);
+        $fadeOut = substr($row->getDbFadeout(), 0, 4);
 
         return array($fadeIn, $fadeOut);
     }
diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php
index 021783c49..c99fbb019 100644
--- a/airtime_mvc/application/models/Playlist.php
+++ b/airtime_mvc/application/models/Playlist.php
@@ -244,6 +244,13 @@ SQL;
             $fades = $this->getFadeInfo($row['position']);
             $row['fadein'] = $fades[0];
             $row['fadeout'] = $fades[1];
+            
+            // format the cues in format 00:00:00(.0)
+            // we need to add the '.0' for cues and not fades
+            // because propel takes care of this for us
+            // (we use propel to fetch the fades)
+            $row['cuein'] = str_pad(substr($row['cuein'], 0, 10), 10, '.0');
+            $row['cueout'] = str_pad(substr($row['cueout'], 0, 10), 10, '.0');
 
             //format original length
             $formatter = new LengthFormatter($row['orig_length']);
@@ -585,9 +592,10 @@ SQL;
         if (!$row) {
             return NULL;
         }
-        #Propel returns values in form 00.000000 format which is for only seconds.
-        $fadeIn = $row->getDbFadein();
-        $fadeOut = $row->getDbFadeout();
+        //Propel returns values in form 00.000000 format which is for only seconds.
+        //We only want to display 1 decimal
+        $fadeIn = substr($row->getDbFadein(), 0, 4);
+        $fadeOut = substr($row->getDbFadeout(), 0, 4);
 
         return array($fadeIn, $fadeOut);
     }
diff --git a/airtime_mvc/application/views/scripts/form/support-setting.phtml b/airtime_mvc/application/views/scripts/form/support-setting.phtml
index 46b93bb6c..f35a6eab1 100644
--- a/airtime_mvc/application/views/scripts/form/support-setting.phtml
+++ b/airtime_mvc/application/views/scripts/form/support-setting.phtml
@@ -3,9 +3,9 @@
     <dl class="zend_form">
         <dd id="SupportFeedback-element" style="width:90%;">
             <div class="info-text">
-                Help Airtime improve by letting us know how you are using it. This info
-                will be collected regularly in order to enhance your user experience.<br /><br />
-                Click "Yes, help Airtime" and we'll make sure the features you use are
+                Help Airtime improve by letting Sourcefabric know how you are using it. This information
+                will be collected regularly in order to enhance your user experience.<br />
+                Click the "Send support feedback" box and we'll make sure the features you use are
                 constantly improving.
             </div>
             <label class="optional" for="SupportFeedback">
@@ -21,9 +21,9 @@
             <?php endif; ?> 
         </dd>
         <dd id="publicize-element" style="width:90%;">
-            <div class="info-text">Click the box below to advertise your station on 
-            <a id="link_to_whos_using" href="http://sourcefabric.org/en/airtime/whosusing" onclick="window.open(this.href); return false">Sourcefabric.org</a>.
-             In order to promote your station, "Send support feedback" must be enabled. This data will be collected in addition to the support feedback.</div>
+            <div class="info-text">Click the box below to promote your station on 
+            <a id="link_to_whos_using" href="http://www.sourcefabric.org/en/airtime/whosusing/" onclick="window.open(this.href); return false">Sourcefabric.org</a>.
+            </div>
             <label class="optional" for="Publicise">
                 <?php echo $this->element->getElement('Publicise') ?>
                 <strong><?php echo $this->element->getElement('Publicise')->getLabel() ?></strong>
@@ -37,7 +37,7 @@
             <?php endif; ?> 
         </dd>
     </dl>
-    <div class="info-text" style="clear: both;padding: 4px 0 4px 15px;"><p> Note: In order to promote your station, "Send support feedback" must be enabled</p></div>
+    <div class="info-text" style="clear: both;padding: 4px 0 4px 15px;">(In order to promote your station, "Send support feedback" must be enabled).<br /><br /></div>
     <?php }?>
     <dl id="public-info" style="display:<?php echo !$this->isSaas?"none":"block"?>;">
         <dt id="stationName-label" class="block-display">
@@ -179,7 +179,7 @@
                 </ul>
             <?php endif; ?>
         <?php }else{?>
-            <a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;">Terms and Conditions</a>
+            <a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;">Sourcefabric Privacy Policy</a>
         <?php }?>
     </div>
 <?php } ?>
diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
index 4ae48b038..6f962b97b 100644
--- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
@@ -57,10 +57,10 @@ if (isset($this->obj)) {
     <div id="crossfade_main" class="crossfade-main clearfix" style="display:none;">
       	<span class="ui-icon ui-icon-closethick sp-closethick-center"></span>
 	    <dl id="spl_editor-main" class="inline-list">
-            <dt>Fade in (s):</dt>
+            <dt>Fade in: <span class='spl_cue_hint'>(ss.t)</span></dt>
             <dd><span contenteditable="true" class="spl_text_input spl_main_fade_in">00</span></dd>
             <dd class="edit-error"></dd>
-            <dt>Fade out (s):</dt>
+            <dt>Fade out: <span class='spl_cue_hint'>(ss.t)</span></dt>
             <dd><span contenteditable="true" class="spl_text_input spl_main_fade_out">00</span></dd>
             <dd class="edit-error"></dd>
         </dl>
diff --git a/airtime_mvc/application/views/scripts/playlist/set-cue.phtml b/airtime_mvc/application/views/scripts/playlist/set-cue.phtml
index 4b44e51ac..5d18a5643 100644
--- a/airtime_mvc/application/views/scripts/playlist/set-cue.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/set-cue.phtml
@@ -1,10 +1,10 @@
 <dl id="spl_cue_editor" class="inline-list">
-    <dt>Cue In:</dt>
+    <dt>Cue In: <span class='spl_cue_hint'>(hh:mm:ss.t)</span></dt>
     <dd id="spl_cue_in_<?php echo $this->id; ?>" class="spl_cue_in">
         <span contenteditable="true" class="spl_text_input"><?php echo $this->cueIn; ?></span>
     </dd>
     <dd class="edit-error"></dd>
-    <dt>Cue Out:</dt>
+    <dt>Cue Out: <span class='spl_cue_hint'>(hh:mm:ss.t)</span></dt>
     <dd id="spl_cue_out_<?php echo $this->id; ?>" class="spl_cue_out">
         <span contenteditable="true" class="spl_text_input"><?php echo $this->cueOut; ?></span>
     </dd>
diff --git a/airtime_mvc/application/views/scripts/playlist/set-fade.phtml b/airtime_mvc/application/views/scripts/playlist/set-fade.phtml
index 6e21fb315..3eed6e47f 100644
--- a/airtime_mvc/application/views/scripts/playlist/set-fade.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/set-fade.phtml
@@ -1,13 +1,13 @@
 <dl id="spl_editor" class="inline-list">
     <?php if ($this->item1Type == 0) {?>
-    <dt>Fade out (s):</dt>
+    <dt>Fade out: <span class='spl_cue_hint'>(ss.t)</span></dt>
     <dd id="spl_fade_out_<?php echo $this->item1; ?>" class="spl_fade_out">
         <span contenteditable="true" class="spl_text_input"><?php echo $this->fadeOut; ?></span>
     </dd>
     <dd class="edit-error"></dd>
     <?php }
     if ($this->item2Type == 0) {?>
-    <dt>Fade in (s):</dt>
+    <dt>Fade in: <span class='spl_cue_hint'>(ss.t)</span></dt>
     <dd id="spl_fade_in_<?php echo $this->item2; ?>" class="spl_fade_in">
         <span contenteditable="true" class="spl_text_input"><?php echo $this->fadeIn; ?></span>
     </dd>
diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
index f970733c0..dd36ffbfc 100644
--- a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
@@ -65,10 +65,10 @@ if (isset($this->obj)) {
     <div id="crossfade_main" class="crossfade-main clearfix" style="display:none;">
       	<span class="ui-icon ui-icon-closethick"></span>
 	    <dl id="spl_editor-main" class="inline-list">
-            <dt>Fade in (s):</dt>
+            <dt>Fade in: <span class='spl_cue_hint'>(ss.t)</span></dt>
             <dd><span contenteditable="true" class="spl_text_input spl_main_fade_in">00</span></dd>
             <dd class="edit-error"></dd>
-            <dt>Fade out (s):</dt>
+            <dt>Fade out: <span class='spl_cue_hint'>(ss.t)</span></dt>
             <dd><span contenteditable="true" class="spl_text_input spl_main_fade_out">00</span></dd>
             <dd class="edit-error"></dd>
         </dl>
diff --git a/airtime_mvc/public/css/bootstrap.css b/airtime_mvc/public/css/bootstrap.css
index 792fc9d72..bf5466865 100644
--- a/airtime_mvc/public/css/bootstrap.css
+++ b/airtime_mvc/public/css/bootstrap.css
@@ -2688,7 +2688,7 @@ fieldset .btn-toolbar {
   box-sizing: border-box;
   }
   .form-horizontal .controls input[type="text"]:only-child {
-    width:90%;
+    width:85%;
     }
 
 
diff --git a/airtime_mvc/public/css/playlist_builder.css b/airtime_mvc/public/css/playlist_builder.css
index 342046a61..ea8a35586 100644
--- a/airtime_mvc/public/css/playlist_builder.css
+++ b/airtime_mvc/public/css/playlist_builder.css
@@ -116,6 +116,11 @@
     color: #D5D5D5;
 }
 
+.spl_cue_hint {
+    font-size: 10px;
+    font-weight: normal;
+}
+
 .ui-state-active .spl_artist,.ui-state-active .spl_offset {
     color: #606060 !important;
 }
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index 2513f97d9..a5937820d 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -18,13 +18,13 @@ var AIRTIME = (function(AIRTIME){
 	
 	function isTimeValid(time) {
 		//var regExpr = new RegExp("^\\d{2}[:]\\d{2}[:]\\d{2}([.]\\d{1,6})?$");
-	    var regExpr = new RegExp("^\\d{2}[:]([0-5]){1}([0-9]){1}[:]([0-5]){1}([0-9]){1}([.]\\d{1,6})?$");
+	    var regExpr = new RegExp("^\\d{2}[:]([0-5]){1}([0-9]){1}[:]([0-5]){1}([0-9]){1}([.]\\d{1})?$");
 		
 		return regExpr.test(time);
 	}
 	
 	function isFadeValid(fade) {
-        var regExpr = new RegExp("^\\d{1}(\\d{1})?([.]\\d{1,6})?$");
+        var regExpr = new RegExp("^\\d{1}(\\d{1})?([.]\\d{1})?$");
 
         return regExpr.test(fade);
 	}
@@ -74,7 +74,7 @@ var AIRTIME = (function(AIRTIME){
             type = $('#obj_type').val();
 		
 		if (!isTimeValid(cueIn)){
-	        showError(span, "please put in a time '00:00:00 (.000000)'");
+	        showError(span, "please put in a time '00:00:00 (.0)'");
 	        return;
 		}
 		$.post(url, 
@@ -111,7 +111,7 @@ var AIRTIME = (function(AIRTIME){
             type = $('#obj_type').val();
 
 		if (!isTimeValid(cueOut)){
-	        showError(span, "please put in a time '00:00:00 (.000000)'");
+	        showError(span, "please put in a time '00:00:00 (.0)'");
 			return;
 		}
 
@@ -150,7 +150,7 @@ var AIRTIME = (function(AIRTIME){
             type = $('#obj_type').val();
 
 		if (!isFadeValid(fadeIn)){
-	        showError(span, "please put in a time in seconds '00 (.000000)'");
+	        showError(span, "please put in a time in seconds '00 (.0)'");
 			return;
 		}
 
@@ -188,7 +188,7 @@ var AIRTIME = (function(AIRTIME){
             type = $('#obj_type').val();
 
 		if (!isFadeValid(fadeOut)){
-	        showError(span, "please put in a time in seconds '00 (.000000)'");
+	        showError(span, "please put in a time in seconds '00 (.0)'");
 			return;
 		}
 
@@ -545,7 +545,7 @@ var AIRTIME = (function(AIRTIME){
 	            type = $('#obj_type').val();
 		    
 		    if (!isFadeValid(fadeIn)){
-	            showError(span, "please put in a time in seconds '00 (.000000)'");
+	            showError(span, "please put in a time in seconds '00 (.0)'");
 			    return;
 		    }
 
@@ -569,7 +569,7 @@ var AIRTIME = (function(AIRTIME){
 	            type = $('#obj_type').val();
 
 		    if (!isFadeValid(fadeOut)){
-	            showError(span, "please put in a time in seconds '00 (.000000)'");
+	            showError(span, "please put in a time in seconds '00 (.0)'");
 			    return;
 		    }
 
diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
index 45e91eed0..35f7b373e 100644
--- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js
+++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
@@ -313,7 +313,7 @@ $(document).ready(function() {
     
     $("#auto_switch_help").qtip({
         content: {
-            text: "Check this box to automatically switch on Master/Show source upon source disconnection."
+            text: "Check this box to automatically switch on Master/Show source upon source connection."
         },
         hide: {
             delay: 500,