Some fixes. 

Gal, 
 here some fixes which make the library work perfectly well with all my Type1 files.