Minor code tidy
Add plugins dir to watch
Always set active to false on end