Watcher: screen info, small cleanup