Some edits to the lang