Some adjustments to completions and prompt