Various fixes/tweaks for the final CKII 2.1.6 version of EMF