Checking in before I make a few changes to font code

Not a lot - just a few tidy ups to the code