Smaller changes. Changed order when set_wakeup is called after some task is removed...