clean up
add autocomplete