I18n and various fixes

Signed-off-by: Tommaso Visconti <tommaso.visconti@gmail.com>
Beta2

Signed-off-by: Tommaso Visconti <tommaso.visconti@gmail.com>