More font cleanup and updating.