fixes + cleaning