Good luck and have a great trip. It's a shame about all of the hassle, but at least everything will go smoothly now :-)