diff --git a/e107_admin/links.php b/e107_admin/links.php
index 585fd50d8..2d1f69360 100644
--- a/e107_admin/links.php
+++ b/e107_admin/links.php
@@ -679,7 +679,7 @@ class links_admin_form_ui extends e_admin_form_ui
 				$cats	= $this->getController()->getLinkArray($catid);
 				$ret	= array();
 				$this->_parent_select_array(0, $cats, $ret);
-				return $this->selectbox('link_parent', $ret, $value, array('size'=>'xlarge','default' => LAN_SELECT));
+				return $this->selectbox('link_parent', $ret, $value, array('size'=>'xlarge','default' => LAN_SELECT."..."));
 			break;
 
 			case 'batch':
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 624f2421d..ce9d9efa4 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -3720,7 +3720,8 @@ class e_parse extends e_parser
 /**
  * New v2 Parser 
  * Start Fresh and Build on it over time to become eventual replacement to e_parse. 
- * Cameron's DOM-based parser. 
+ * Cameron's DOM-based parser.
+ *
  */
 class e_parser
 {
@@ -4662,6 +4663,8 @@ class e_parser
 
 		$type = pathinfo($file, PATHINFO_EXTENSION);
 
+		$id = str_replace(".".$type, "", $file);
+
 		$thumb = vartrue($parm['thumb']);
 		$mode = varset($parm['mode'],false); // tag, url
 
@@ -4692,6 +4695,7 @@ class e_parser
 
 		if($type === 'youtube')
 		{
+
 		//	$thumbSrc = "https://i1.ytimg.com/vi/".$id."/0.jpg";
 			$thumbSrc = "https://i1.ytimg.com/vi/".$id."/mqdefault.jpg";
 			$video =  '<iframe class="embed-responsive-item" width="560" height="315" src="//www.youtube.com/embed/'.$id.'?'.$ytqry.'" style="background-size: 100%;background-image: url('.$thumbSrc.');border:0px" allowfullscreen></iframe>';
diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php
index a525d808f..209513caa 100644
--- a/e107_handlers/media_class.php
+++ b/e107_handlers/media_class.php
@@ -1323,7 +1323,7 @@ class e_media
 			
 
 
-		$text = "\n\n<!-- Start Item -->
+		$text = "\n\n
 		
 		<div class='media-carousel ".$data['gridClass']."'>
 		
@@ -1405,7 +1405,10 @@ class e_media
 			
 			$text .= "</div>
 			
-			</div>\n<!-- End Item -->\n\n";
+			</div>\n\n\n";
+
+
+
 		
 		return $text;
 
@@ -1545,7 +1548,7 @@ class e_media
 		//	$text .= $this->search('srch', $srch, 'go', $filterName, $filterArray, $filterVal).$frm->hidden('mode','online');
 			
 			
-				$text .= '<div id="'.$carouselID.'"  class="carousel slide" data-interval="false">';
+				$text .= '<div id="'.$carouselID.'"  class="carousel slide" data-interval="false" data-wrap="false">';
 			//	$text .= '{INDICATORS}';
 				$text .= '<div style="margin-top:10px" class="row admingrid carousel-inner">';
 			
@@ -1555,6 +1558,7 @@ class e_media
 				$perPage = vartrue($parm['perPage'],12);
 				
 				$c=0;
+
 				
 				$slides = array();
 
@@ -1567,11 +1571,18 @@ class e_media
 						if($c == 0)
 						{
 							$active = (count($slides) <1) ? ' active' : '';
+
 							$text .= '
 
 							<!-- Start Slide -->
 							<div class="item'.$active.'">';
 
+							if(count($slides)  > 1)
+							{
+
+								$text .= "<!-- ";
+							}
+
 							if(vartrue($val['slideCaption']))
 							{
 								$text .= "<h4>".$val['slideCaption']."</h4>";
@@ -1586,10 +1597,12 @@ class e_media
 						$val['bbcode']	= $parm['bbcode'];
 						$val['gridClass'] = $parm['gridClass'];
 
+
 						$text .= $this->browserCarouselItem($val);
 
 						$c++;
 
+
 						if(varset($val['slideCategory']) && isset($prevCat))
 						{
 							if($val['slideCategory'] !== $prevCat)
@@ -1603,14 +1616,25 @@ class e_media
 
 						if($c == $perPage)
 						{
+							if(count($slides) > 1)
+							{
+								$text .= " -->";
+							}
+
+
 							$text .= '
 							</div>
 							<!-- End Slide -->
 
 							';
+
+
+
 							$slides[] = 1;
 							$c = 0;
 						}
+
+
 					}
 				
 				}
diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index 2d18f8f48..a81a2dd36 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -323,7 +323,7 @@ define("LAN_ORDER","Order");
 define("LAN_ASC","ASC");
 define("LAN_DESC","DESC");
 
-define("LAN_SELECT","Select ...");
+define("LAN_SELECT","Select");
 define("LAN_ADMIN","Admin");
 define("LAN_ROOT","Root");
 define("LAN_LINE","Line");
diff --git a/e107_plugins/admin_menu/admin_menu.php b/e107_plugins/admin_menu/admin_menu.php
index 05614b057..686d27afb 100644
--- a/e107_plugins/admin_menu/admin_menu.php
+++ b/e107_plugins/admin_menu/admin_menu.php
@@ -29,7 +29,7 @@ if (ADMIN == TRUE)
 
 	$amtext = "<div class='text-center' style='text-align:center'>
 	<select name='activate' onchange='urljump(this.options[selectedIndex].value)' class='tbox form-control'>
-	<option>".LAN_SELECT."</option>\n";
+	<option>".LAN_SELECT."...</option>\n";
 	foreach ($array_functions as $link_value)
 	{
 		$amtext .= render_admin_links($link_value['link'], $link_value['title'], $link_value['perms']);
diff --git a/e107_plugins/banner/admin_banner.php b/e107_plugins/banner/admin_banner.php
index 45df63006..a6ec6116a 100644
--- a/e107_plugins/banner/admin_banner.php
+++ b/e107_plugins/banner/admin_banner.php
@@ -528,7 +528,7 @@ class banner_form_ui extends e_admin_form_ui
 				$text = '';
 				if (count($this->clients)) 
 				{
-					$text = $frm->select('banner_clientname_sel',$this->clients, $curVal,'', LAN_SELECT);
+					$text = $frm->select('banner_clientname_sel',$this->clients, $curVal,'', LAN_SELECT."...");
 					$text .= $frm->text('banner_clientname','','',array('placeholder'=> 'Or enter a new client'));	
 				}
 				else
@@ -611,7 +611,7 @@ class banner_form_ui extends e_admin_form_ui
 			case 'write': // Edit Page
 				if (count($this->campaigns)) 
 				{
-					$text = $frm->select('banner_campaign_sel',$this->campaigns, $curVal,'',LAN_SELECT);
+					$text = $frm->select('banner_campaign_sel',$this->campaigns, $curVal,'',LAN_SELECT."...");
 					$text .= $frm->text('banner_campaign','','',array('size'=>'xlarge', 'class'=>'e-hideme','placeholder'=> 'Enter a campaign name'));
 				}
 				else
@@ -1030,7 +1030,7 @@ if ($action == "create")
 
 	if (count($campaigns)) 
 	{
-		$text .= $frm->select('banner_campaign_sel',$campaigns,$_POST['banner_campaign'],'',LAN_SELECT);
+		$text .= $frm->select('banner_campaign_sel',$campaigns,$_POST['banner_campaign'],'',LAN_SELECT."...");
 		$text .= $frm->text('banner_campaign','','',array('placeholder'=> 'Or enter a new campaign'));	
 	}
 	else
@@ -1048,7 +1048,7 @@ if ($action == "create")
 
 	if (count($clients)) 
 	{
-		$text .= $frm->select('banner_client_sel',$clients, $_POST['client_name'],'', LAN_SELECT);
+		$text .= $frm->select('banner_client_sel',$clients, $_POST['client_name'],'', LAN_SELECT."...");
 		$text .= $frm->text('client_name','','',array('placeholder'=> 'Or enter a new client'));	
 		
 		
diff --git a/e107_plugins/import/admin_import.php b/e107_plugins/import/admin_import.php
index 0cf3a817b..b00e51fe0 100644
--- a/e107_plugins/import/admin_import.php
+++ b/e107_plugins/import/admin_import.php
@@ -501,7 +501,7 @@ class import_main_ui extends e_admin_ui
 			$text .= "
 			<tr>
 			<td >$importType ".LAN_CONVERT_22."</td>
-			<td >".$frm->select('dbParamDatabase', $databases, null, array('required'=>1), LAN_SELECT)."</td>
+			<td >".$frm->select('dbParamDatabase', $databases, null, array('required'=>1), LAN_SELECT."...")."</td>
 			</tr>
 			<tr>
 			<td >$importType ".LAN_CONVERT_23."</td>
diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js
index 8343d8495..bc51a215d 100644
--- a/e107_web/js/core/admin.jquery.js
+++ b/e107_web/js/core/admin.jquery.js
@@ -787,8 +787,24 @@ $(document).ready(function()
 		  var currentIndex = $(this).find('.active').index();
 		  var text = (currentIndex + 1);
 		  var id = $(this).attr('id') + '-index'; // admin-ui-carousel-index etc.
-
 		  $('#'+id).text(text);
+
+			// this takes commented content for each carousel slide and enables it, one slide at a time as we scroll.
+
+			$(this).find('.item').each(function(index, node)
+			{
+				var content = $(this).contents();
+
+				var item = content[0];
+
+				if(item.nodeType === 8) // commented code @see e_media::browserCarousel() using '<!--'
+				{
+					$(item).replaceWith(item.nodeValue);
+					return false;
+				}
+
+			});
+
 		});