stepHandler small fix, and upadte