Adding I18n support as well as doing small tweaks

I have commented the changes individually. Hope you like it.