Made little progress on the font issue, but fixed a few tiny things.
Reverting.