slight refactorings
refactoring factories
update readme and defaults