finish updater and TODOs