Add locales & Improve look of the comments