fix some rotation isssues