Some localization and bugfixes