fix changes from cleanup

the code updating the source should remain in the parser
in watcher is triggered by event
minor clean ups
more fine-grained change testers