Parser improvements
temp fix for font