correct docs
improve the way we handle namespaces