Add line highlighting, fix typos