fix bugs, finish clean task