speed tweaks, removed scale-fix and extra font call