This is why I kept saying that it was too late in the game to resolve all the issues that would come up. The script had core reaching flaws.
So, praise to them for making drastic changes, but there was no way to completely rework the spine of the story they chose without basically reshooting the movie they set out to make. The fact they basically reshot a third of it and then did additional pick ups is still very surprising to me.