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