fixed errors
add internationality