Minor improvements to basic example

Also things that were changed in #39 that didn't really belong there.