Add some more variation to the v2.01 sample files.
Upgrade output interface to v2.01