Improved logging. Started to work on watcher