Made a couple of fixes. Also checking in a couple of examples.