diff --git a/e107_core/shortcodes/batch/comment_shortcodes.php b/e107_core/shortcodes/batch/comment_shortcodes.php
index 12275411b..6c27dcde4 100644
--- a/e107_core/shortcodes/batch/comment_shortcodes.php
+++ b/e107_core/shortcodes/batch/comment_shortcodes.php
@@ -105,8 +105,14 @@ class comment_shortcodes extends e_shortcode
 	function sc_comment_avatar($parm='')
 	{
 		$tp 	= e107::getParser();
-		$text = $tp->parseTemplate("{USER_AVATAR=".vartrue($this->var['user_image'],USERIMAGE)."}");		
 		
+	//	return $this->var['user_image']; 
+	
+	//	$url = $tp->thumbUrl($this->var['user_image']); 
+	
+	//	$text = $tp->parseTemplate("{USER_AVATAR=".vartrue($this->var['user_image'],USERIMAGE)."}");
+		$text = $tp->parseTemplate("{USER_AVATAR=".$this->var['user_id']."}");				
+		$text = 
 		$text .= "<div class='field-help' style='display:none;'>
 		<div class='left'>";
 		$text .= "<h2>".$this->sc_username()."</h2>";
diff --git a/e107_core/shortcodes/single/user_avatar.php b/e107_core/shortcodes/single/user_avatar.php
index 5f3d32c73..b95338cce 100644
--- a/e107_core/shortcodes/single/user_avatar.php
+++ b/e107_core/shortcodes/single/user_avatar.php
@@ -1,11 +1,10 @@
 <?php
 // $Id$
-function user_avatar_shortcode($parm=null)
+function user_avatar_shortcode($parm=null) //TODO new function $tp->toAvatar(); so full arrays can be passed to it. 
 {
 	global $loop_uid;
 	
-	
-	
+		
 	$tp 		= e107::getParser();
 	$width 		= $tp->thumbWidth;
 	$height 	= ($tp->thumbHeight !== 0) ? $tp->thumbHeight : "";
diff --git a/e107_core/templates/comment_template.php b/e107_core/templates/comment_template.php
index 259692b42..68b3766d3 100644
--- a/e107_core/templates/comment_template.php
+++ b/e107_core/templates/comment_template.php
@@ -97,7 +97,7 @@ $sc_style['MODERATE']['post']	= '</div>';
 
 
 $COMMENT_TEMPLATE['form']			= "
-	{SETIMAGE: w=60}
+	{SETIMAGE: w=100&h=100}
 	<div class='media comment-box comment-box-form clearfix'>
 		<div class='comment-box-left media-object pull-left' >
 		{COMMENT_AVATAR}
@@ -119,7 +119,7 @@ $COMMENT_TEMPLATE['form']			= "
 
 
 $COMMENT_TEMPLATE['item'] = '
-		{SETIMAGE: w=100}
+		{SETIMAGE: w=100&h=100}
 		<div class="media-object comment-box-left pull-left span1">
 			{COMMENT_AVATAR}
 		</div>	
diff --git a/e107_handlers/comment_class.php b/e107_handlers/comment_class.php
index 4a8f20bf5..6591ab7d5 100644
--- a/e107_handlers/comment_class.php
+++ b/e107_handlers/comment_class.php
@@ -400,6 +400,7 @@ class comment
 		
 		e107::getScBatch('comment')->setVars($row);
 		
+		
 		$COMMENT_TEMPLATE 					= $this->template; 
 		
 	//	$COMMENT_TEMPLATE['ITEM_START'] 	= "\n\n<div id='{COMMENT_ITEMID}' class='comment-box clearfix'>\n";
@@ -969,7 +970,7 @@ class comment
 			{
 					
 				//	$modcomment .= "<a href='".e_ADMIN_ABS."modcomment.php?$table.$id'>".COMLAN_314."</a>";
-					$modcomment .= "<a class='btn btn-default btn-mini' href='".e_ADMIN_ABS."comment.php?searchquery={$id}&filter_options=comment_type__".$this->getCommentType($table)."'>".COMLAN_314."</a>";		
+					$modcomment .= "<a class='btn btn-default btn-mini btn-sm' href='".e_ADMIN_ABS."comment.php?searchquery={$id}&filter_options=comment_type__".$this->getCommentType($table)."'>".COMLAN_314."</a>";		
 					
 					
 			}
@@ -1076,13 +1077,12 @@ class comment
 		$text 			= "";
 		$lock 			= '';
 
-		if ($sql->db_Select_gen($query))
+		if ($rows = $sql->retrieve($query,true))
 		{
 		//	$text .= "<ul class='comments'>";
 						
-			$width = 0; 			
-			$rows = $sql->db_getList(); //Shortcodes could use $sql, so just grab all results
-
+			$width = 0; 	
+			
 			foreach ($rows as $row)
 			{
 				
@@ -1120,9 +1120,9 @@ class comment
 		
 		// from calculations are done by eNav() js. 
 		return "
-		<a class='e-ajax btn btn-default btn-mini' href='#' data-nav-total='{$this->totalComments}' data-nav-dir='down' data-nav-inc='{$this->commentsPerPage}' data-target='comments-container' data-src='".e_BASE."comment.php?mode=list&amp;type=".$table."&amp;id=".$id."&amp;from=0'>Previous</a>
+		<a class='e-ajax btn btn-default btn-mini btn-sm' href='#' data-nav-total='{$this->totalComments}' data-nav-dir='down' data-nav-inc='{$this->commentsPerPage}' data-target='comments-container' data-src='".e_BASE."comment.php?mode=list&amp;type=".$table."&amp;id=".$id."&amp;from=0'>Previous</a>
 		
-		<a class='e-ajax btn btn-default btn-mini' href='#' data-nav-total='{$this->totalComments}' data-nav-dir='up' data-nav-inc='{$this->commentsPerPage}' data-target='comments-container' data-src='".e_BASE."comment.php?mode=list&amp;type=".$table."&amp;id=".$id."&amp;from=0'>Next</a>
+		<a class='e-ajax btn btn-default btn-mini btn-sm' href='#' data-nav-total='{$this->totalComments}' data-nav-dir='up' data-nav-inc='{$this->commentsPerPage}' data-target='comments-container' data-src='".e_BASE."comment.php?mode=list&amp;type=".$table."&amp;id=".$id."&amp;from=0'>Next</a>
 		
 		";