Fix comments.
Add display of line numbers.