minor updates. About to incorporate typeahead