add some comments, tighten some regexps