removed a few redundant comments, fixed the 'comment' regex