#482 - Minor tweaks to namespace layout and doc typos