Lots of updates. Primarily: clarify namespaced keys, make setup/cleanup nicer