Sort properties in same order as documentation for easier reference. Add some comments. There are no intended changes to the substance.