Reshuffle tasks and add notes