More improvements to task list