Redid some of the localization. Effectivally fixed #72