More tweaking of examples