Include base and head line numbers

Previously these were called 'ln', 'ln1', 'ln2'