Server watcher service
Fixed bugs