fixes + add clean task