Hawk module + small fixes

I have added my hawk module to the code (untested) and did some small fixes.