added l18n and messages