tidy up
typeahead for #9, #19