Rework watch and add dist task.