fixes and refactorings