few changes, getting ready for refactoring