#1 refactoring, fixes