Docs and hawk improvements