comments modified
changed comment
setup watch task - still buggy