more localization and small bugfix