Adding updater, minor cleanup