inline doc changes and namespace fixes