further improvements in enable/disable monitoring