Added watch task, fixed clean tasks