quick corrections before real refactoring starts