movement rework & collision improvement