Added Localizations and polishing up the code here and there