tidy a bit; reorganize completions; don't auto-accept on '@' etc