diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index afa4baa7a..52660ec21 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -393,7 +393,8 @@ class LibraryController extends Zend_Controller_Action
             }
             $c[0] = $c['item_id'];
         }
-        $newPl->addAudioClips($contents, null, 'begining');
+        
+        $newPl->addAudioClips($contents, null, 'before');
         
         $newPl->setCreator(Application_Model_User::getCurrentUser()->getId());
         $newPl->setDescription($originalPl->getDescription());
diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index 97968efe1..f63d1d861 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -330,7 +330,7 @@ SQL;
     {
         list($value, $modifier) = $this->getLimitValueAndModifier();
         if ($modifier == "items") {
-            $length = $value." ".$modifier;
+            $length = $value." "._("items");
         } else {
             $hour = "00";
             $mins = "00";
@@ -1354,6 +1354,21 @@ SQL;
             "year"         => _("Year")
         );
 
+        $modifierOptions = array(
+            "0"                => _("Select modifier"),
+            "contains"         => _("contains"),
+            "does not contain" => _("does not contain"),
+            "is"               => _("is"),
+            "is not"           => _("is not"),
+            "starts with"      => _("starts with"),
+            "ends with"        => _("ends with"),
+            "is"              => _("is"),
+            "is not"          => _("is not"),
+            "is greater than" => _("is greater than"),
+            "is less than"    => _("is less than"),
+            "is in the range" => _("is in the range")
+        );
+
         // Load criteria from db
         $out = CcBlockcriteriaQuery::create()->orderByDbCriteria()->findByDbBlockId($this->id);
         $storedCrit = array();
@@ -1365,11 +1380,20 @@ SQL;
             $extra = $crit->getDbExtra();
 
             if ($criteria == "limit") {
-                $storedCrit["limit"] = array("value"=>$value, "modifier"=>$modifier);
+                $storedCrit["limit"] = array(
+                    "value"=>$value,
+                    "modifier"=>$modifier,
+                    "display_modifier"=>_($modifier));
             } else if($criteria == "repeat_tracks") {
                 $storedCrit["repeat_tracks"] = array("value"=>$value);
             } else {
-                $storedCrit["crit"][$criteria][] = array("criteria"=>$criteria, "value"=>$value, "modifier"=>$modifier, "extra"=>$extra, "display_name"=>$criteriaOptions[$criteria]);
+                $storedCrit["crit"][$criteria][] = array(
+                    "criteria"=>$criteria,
+                    "value"=>$value,
+                    "modifier"=>$modifier,
+                    "extra"=>$extra,
+                    "display_name"=>$criteriaOptions[$criteria],
+                    "display_modifier"=>$modifierOptions[$modifier]);
             }
         }
 
diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php
index 660864af5..e01484d2f 100644
--- a/airtime_mvc/application/models/Playlist.php
+++ b/airtime_mvc/application/models/Playlist.php
@@ -411,26 +411,38 @@ SQL;
                 || $obj instanceof CcWebstream ||
                 $obj instanceof CcBlock) {
 
-                $entry               = $this->plItem;
-                $entry["id"]         = $obj->getDbId();
-                $entry["pos"]        = $pos;
+                $entry = $this->plItem;
+                $entry["id"] = $obj->getDbId();
+                $entry["pos"] = $pos;
                 $entry["cliplength"] = $obj->getDbLength();
+                
                 if ($obj instanceof CcFiles && $obj) {
-                    $entry["cuein"]      = $obj->getDbCuein();
-                    $entry["cueout"]     = $obj->getDbCueout();
+                	
+                    $entry["cuein"] = isset($p_item['cuein']) ? 
+                    		$p_item['cuein'] : $obj->getDbCuein();
+                    
+                    $entry["cueout"] = isset($p_item['cueout']) ? 
+                    		$p_item['cueout'] : $obj->getDbCueout();
 
-                    $cue_out = Application_Common_DateHelper::calculateLengthInSeconds($entry['cueout']);
-                    $cue_in = Application_Common_DateHelper::calculateLengthInSeconds($entry['cuein']);
-                    $entry["cliplength"] = Application_Common_DateHelper::secondsToPlaylistTime($cue_out-$cue_in);
-                } elseif ($obj instanceof CcWebstream && $obj) {
+                    $cue_in = isset($p_item['cueInSec']) ? 
+                    		$p_item['cueInSec'] : Application_Common_DateHelper::calculateLengthInSeconds($entry['cuein']);
+                    
+                    $cue_out = isset($p_item['cueOutSec']) ? 
+                    		$p_item['cueOutSec'] : Application_Common_DateHelper::calculateLengthInSeconds($entry['cueout']);
+                    
+                    $entry["cliplength"] = isset($p_item['length']) ? 
+                    		$p_item['length'] : Application_Common_DateHelper::secondsToPlaylistTime($cue_out-$cue_in);
+                } 
+                elseif ($obj instanceof CcWebstream && $obj) {
                     $entry["cuein"] = "00:00:00";
                     $entry["cueout"] = $entry["cliplength"];
                 }
-                $entry["ftype"]      = $objType;
+                $entry["ftype"] = $objType;
             }
 
             return $entry;
-        } else {
+        } 
+        else {
             throw new Exception("trying to add a object that does not exist.");
         }
     }
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index c10ea4c9a..afe05bd9c 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -587,13 +587,13 @@ var AIRTIME = (function(AIRTIME){
                                         var extra = (ele['extra']==null)?"":"- "+ele['extra'];
                                         $html += "<li>" +
                                             "<span class='block-item-title'>"+ele['display_name']+"</span>" +
-                                            "<span class='block-item-criteria'>"+ele['modifier']+"</span>" +
+                                            "<span class='block-item-criteria'>"+ele['display_modifier']+"</span>" +
                                             "<span class='block-item-criteria'>"+ele['value']+"</span>" +
                                             "<span class='block-item-criteria'>"+extra+"</span>" + 
                                             "</li>";
                                     });
                                 }
-                                $html += "<li><br /><span class='block-item-title'>"+$.i18n._("Limit to: ")+data.limit.value+"  "+data.limit.modifier+"</span></li>";
+                                $html += "<li><br /><span class='block-item-title'>"+$.i18n._("Limit to: ")+data.limit.value+"  "+data.limit.display_modifier+"</span></li>";
                             }
                             $pl.find("#block_"+id+"_info").html($html).show();
                             mod.enableUI();