tasks fixes

by @nidzix and me. had to merge it all together. @eozan pls review