better jumps, form cleanup, treatment updates