fixed rotate bug

fixed two bugs with rotate (1)extra drop-by-one (created trying to solve
#2) and (2) certain shapes messed up when rotated below line 10