improve the support for fonts with more that one master
fis some class definitions