Font Fixes and other minor things