Myriad small changes to improve example output/ease of producing example
output.