ALL the fixes + cleaning