Add line numbers, original form, better print format