- some minor fixes after great refactoring