Autocomplete done and a few extra goodies