correct issues with reset-fileset, cleanup after watch task