updates to font
fixed conflicts and pushing font fixes up to branch