Fixed rotations

Also made the rotations reset if you press r without changing the
rotation, seems to work well