final fixes & typeahead