Fixed and cleaned updater