Fold some long lines
Make line numbers relevant; resolves issue #5