More completions, and some moved to snippets