Adress a couple of concerns

One thing that might still be problematic is the ordering of the examples. Perhaps it should be alphabetic?