Adding a few extra tweaks re highlighting, searching, scrolling, wrapping.