There are a couple of errors in the drawing :
-1- We don't use rated sail area's anymore; max mainsail area (real) = 15.0 sq. mtr. and max jib area (real) = 3.7 sq. mtr. We also don't use the combined area of mainsail+jib anywhere in the class rules anymore.
-2- 104 kg is the minimum weight for the 1-up setup and not for the 2-up setup
-3- The gennaker clew corner is much higher up and maybe you can make the mainsail look more modern with a larger squaretop and a more straight leech.
-4- All F16 jibs are selftacking these days; the draw jib setup is still the old overlapping Taipan 4.9 setup with the blocks halveway down the trampoline.
Wouter