Bugfixes

Some bugfixes and renaming of LocalizationHelper to LocalizationHandler