Changed angles and actions to be coherent. Seems to work better now (less circles and stuff)