Revert comments for cleanliness in the public branch
Fix a watcherCallback bug