Remove duplicate keys and fix other unimportant details.
Update docs