Added localization. Fixed minor issues