Minor fixes and better doc-strings
Cleanup publish a bit