Rotation fix and a few tweaks