Bug fixes  + stepper control added