Minor bug fixes.
Moved cav-setup.scm to the examples collection.