namespaces + buffered key + test coverage + cleanup, fixes #8