made tasks, some fixes