few fixes to watch task and add some comments