* removed unused includes
* implemented reset and step
* added missing header files