Fixed HAWK implementation

* some refactoring and comment fixes
* fixed smoketest to be more explicit about things.
* moved some prints to debug statements