Improve watchers, start/stop, complete 'info' command.