refactored tasks, everything back in order