new comments, some refactoring, thread limit