Added line end indicators and refined find. Various tweaks.