working rotation
indentation fix
Merge and logic fixes