Some small changes to task list, WIP