Re: Doc fixes and @namespace removal