Adding labels for both controls, fixing small math glitches