Some more task tweaking