removed some unneeded includes, added gradual snapping to x and y axes, to go with the gradual rotation snapping