Collision fixes and running added \o/
http://gyazo.com/6b6a51ad554c58b46cbd2052349b102e