New examples and general cleanup.