implement following for highlights and jump to last highlight on toggle

sideporting from web/sublime - and other cleanup.