Jslint fix + Better watch