Font fixes and more minor tweaks