More completions, fix importing for some