Changes to Watchers class, and to the main method of the eqsimple class