Some work on the examples to get it cleaned up.