Localization Enhancement & Bug Fixes!