Cleaned up command watcher, added server watching