add keywords and desc, and fix syntax err
consolidate watcher