Add Eggman's suggestions
-Some enable/disable work