fix 16 - another very large update

Detailed changelog to be written