clean up examples, consistent ordering of directives, bump versions of some things to appear more current