fixes
further refactoring