fixed some issues with rotations