Patch 2

l18n fixes and improvement