change Daemon and Catalog to properly work as singletons, update docs