Namespace fix and docblocks