Opentype and Matra fixes

tweaks and detailing