I *think* its all working, and it shouldnt break saves.

--orientation issues fixed