added typeahead and stuffs