Fixes

Improved Code and Fixed Locales not showing up correctly.