Better collision and movements