i18n
+ Small fixes