better algorithm for finding comments. #37