Added internationalization support and fixed some bugs

Added internationalization support and fixed some bugs