More enable/disable work for #35
-Also more Updater work for #38