Add Internationalizing and Localizing + fixes