Language update and tiny style fixes