small fixes; auto import moRe