Added a few completions and useful defaults