autocomplete and fixes