Font Fixes and Data Structure Optomizations