some tweaks
added enablling and disabling