Collision detection and more env fixes, broken push (sorry)