Minor updates to configuration and continued work on samples for documentation.
Cleaned up sample a bit.