Font fix, lots of updates