add xml generator and start fix Watcher. Look out for url in comments.