stop using deprecated watch() method,
and various other fixes, refs #134