Some translation changes and more stuff