Fix typos etc.
Reorder features, and format changed