Collision detection and platform fixes
John fixed thy merges