Cleanup and Fix enable/disable
update