autocomplete second word

and other minor changes