map: add some method helpers
updater: add state cleanup