Fix rotation and minor glitches