It didnt get any better.
When the trailer first aired it took me all of a minute to Google maximum weight a helicopter can carry and the average weight of a galleon.
It was at that point that I realized I had done more research than the films writers.