Cleanup and fixed translations