one step closer of a first acceptable version
add a bit of internationalization