fixes #38 fixes #35
Moar rotation fixes. I'm thinking this may not be the best way to do this.