Pushed fixed. Climb fixed. Some clean-up.