more climb fixes