fixes + refacto