fixes and tasks1 implementation