updater fix and minor improvements