fixed rotation and added movement in x
merged style changes
merged master with x movement branch