Extra bug fixes, cleanup, make MemoryMetaStore subclassable