Fixed demo not displaying the correct font in fitting.
Minor tweaks.