Various fixes

Added localization