Fixes to 2D! now allows correct rotation!