Internationalization + correction bugs

internalization and minor bugs corrections