a bunch of changes.  about to work on the autocomplete