Added some useful APIs. Clean up a lot of stuff related to execution of a step and stepping itself.