minor upgrades, expanding example set for extended testing work