remove a lot of redundant commented out code
small typo
refine watching, plus demo