cleaned up a bit and improved examples