watch: further reporting improvements