Added localization and some fixes