Fix line numbers

[shnupta]

Line numbers work, but pretty badly...

[bleepcord]

Specific problems? I wouldn't mind taking a look at these. I've noticed there are some issues with proper counting in narrower windows so I can definitely start there.