Separate font class and font rendering fixes and cleanup. Plus other smaller fixes