Collision fully working, fixed a wall-thru bug