Annotator - revise JS comments, remove TODO.