translation correction
whole new changes and bug fixes