Various task updates and tweaks