better movement & collision handling