More polishing, spruced up example code.