Second pass, some additional formatting and a few more examples.