Enabled/Disabled state changes

I've did some improvements to enabled/disable state. (#5)