Fix existing comments, add num lines