Fine tuned X movement, undid broken collision code

Redoing movement and collision, planned out changes just need time to
implement.