font cleanup, header tweaks