Tidy translation tables as per review suggestions, and fix some bugs arising.