beautification

rotation handling WIP