#1 fixes, refactoring