Added watcher notification, moved python syntax TODOs to where they actually need to be.