reverted updater hack; other fixes