refactoring; saving completions
minor updates