diff --git a/bigbluebutton-config/bin/bbb-record b/bigbluebutton-config/bin/bbb-record
index 35d6e9b862dd084633daa1376f991ef2b1f2b9bb..76e6a915d19065bf51f9b801e1eafb059768f80a 100755
--- a/bigbluebutton-config/bin/bbb-record
+++ b/bigbluebutton-config/bin/bbb-record
@@ -350,8 +350,6 @@ if [ -z $HEAD ]; then
 	HEAD=99999
 fi
 
-/var/bigbluebutton/recording/raw$ cat /tmp/t | sort -t - -k 2 -r| uniq
-
 tmp_file=$(mktemp)
 ls -t /var/bigbluebutton | grep "[0-9]\{13\}$" | head -n $HEAD > $tmp_file
 ls -t /var/bigbluebutton/recording/raw | grep "[0-9]\{13\}$" | head -n $HEAD >> $tmp_file
diff --git a/record-and-playback/presentation/scripts/publish/presentation.rb b/record-and-playback/presentation/scripts/publish/presentation.rb
index c07da286b9c3ab4ad62139bebb9aab5e7c7049e3..ebbbd504ea50d32a31b3db668bc11b65863f4797 100644
--- a/record-and-playback/presentation/scripts/publish/presentation.rb
+++ b/record-and-playback/presentation/scripts/publish/presentation.rb
@@ -285,7 +285,12 @@ def storeRectShape
 				$originX = $originX + rectWidth
 				rectWidth = rectWidth.abs
 			end
-			$xml.rect(:x => $originX, :y => $originY, :width => rectWidth, :height => rectHeight)
+                        if $is_square == "true"
+				#width of the square as reference
+                                $xml.rect(:x => $originX, :y => $originY, :width => rectWidth, :height => rectWidth)
+                        else
+                                $xml.rect(:x => $originX, :y => $originY, :width => rectWidth, :height => rectHeight)
+                        end
 			$prev_time = $shapeCreationTime
 		end
 	end
@@ -373,9 +378,10 @@ def storeTextShape
 			$text_count = $text_count + 1
 		end
 		font_size_factor = 1.7
-		extra_percent = -0.7
-		width = ( ($textBoxWidth.to_f + extra_percent) / 100.0) * $vbox_width
-		height = ( ($textBoxHeight.to_f + extra_percent) / 100.0) * $vbox_height
+                width_extra_percent = -0.7
+                height_extra_percent = 1
+                width = ( ($textBoxWidth.to_f + width_extra_percent) / 100.0) * $vbox_width
+                height = ( ($textBoxHeight.to_f + height_extra_percent ) / 100.0) * $vbox_height
 		y_gap = -30.0 		
 		x_gap = 5.0
 		$textFontSize_pixels = $textFontSize.to_f * font_size_factor				
@@ -560,6 +566,7 @@ def processShapesAndClears
 
 							# Process the rectangle shapes
 							elsif $shapeType.eql? "rectangle"
+                                                                $is_square = shape.xpath(".//square")[0].text()
 								storeRectShape()
 
 							# Process the triangle shapes