Fix incorrect namespacing
Tweeks docbocks & minor fixes