Merge tasks + many improvements