Update Updater & other tiny changes