- Fixed most of the i18n issues with Hassan's suggestions