added autocomplete | removed some stuff