minor tweaks
Leaves internationalization to .Net