Fix Enable to properly Handle Modules
Closes #1
Fix Disable, this fixes Enable too (Can't enable enabled things, and stuff wasn't disabling properly).
Closes #2