fixed some rotate issues