refactoring & fixes
fixes