More example improvements.