WIP #25. Removed comparison stepper btn from certain states.