Some minor language fixes and improvements