more fixes and Open Type refinements.