Correct some bad assumptions and update fonts