more tweaks; highlighting upon choice