Add next task, now threaded, bugs squashed