add more autocomplete stuff, remove junk