new tasks, some minor fixes