watch task tweaks