Add main namespace, update docs
Misc updates