Fix tasks, add more tasks