Localization + Minor Bugfixes