fix minor issues
fix rotation