Collision/jumping comments and cleanup