fix movement and collision (sort of)

fixed movement for sure, but collision is still a little iffy