font fixes and a few other bits