some other changes and completions