fixes for watcher, starting restyle