improved some completions, added new ones