Typeahead added; plus small changes