working on problems caused by refactoring, and new refactorings