renamed enabled/disable to start/stop, cleanup