fixed tasks order, more changes