various fixes + autocomplete