More task testing/tweaking