Fixed up some rotating issues, but some cases are still wonky