removing some debug code.
Merge branch 'master' into latest
fixing $watch.