refactor
fixes + refactors