collision and movement fixed