Relative line numbers and some mapping changes