I believe you're correct Leif on the heritage of Tante Ju.
Some more information -
1) "Mr. C, It's Tuesday" is actually on loan to the CAF Museum to free up room in the hangars at the
Cavanaugh Flight Museum in Addison (Dallas) for the CAF's B-24A. They might be doing the annual on it right now though, so that was probably the work you were seeing.
2) "FiFi"'s re-engining (the #3 engine is already the new one) is costing somewhere around $3 million total for 5 engines, however the 2nd engine was sold/donated to the Rare Bear racing team who then proved the design to be sound by taking it at full power around the pylons at Reno last year. These engines are expected to last around 1,000 hours on the wing, which will be longer than what airframe life is left in FiFi and will take at least a decade to work off anyway.
3) The Swordfish was flyable, but due to some circumstances that occurred around the donation, the aircraft is now permanently static.
Hope you can make it out to MAF for AirSho in October. It'll be quite a sight and if things go well, it'll also be FiFi's return to flight.