Final fix for Font issues.
Added some comments for myself.
Tiny refactor to move something into a function.