Line numbers, other improvements