Fixed some zoom issues / updated rotation logic