JSHint/comments/bug fixes