comments, changes per #25