some more completions and minor stuff