Autocomplete added, Bug fixes