font tweaks, some refactoring