Bugfix/fix examples

Built on PR #303.

Clean up the examples directory.  See commit comments for specifics.