Grammarfixes and slight changes to watch script interface.