fixes and mass updater