Tweaked rotation-calculations. Not quite perfect though...