Rework examples some more