collision + movement fix