Fix comments
Use 1-16 as basis for 1-17 and display entire lines.