Add watch, make separate clean tasks and outfiles