various tweaks to completions