revise listsource & wildcard & some other trivial