Fixed some more bugs with rotation (there are still lots to fix though o.o)