a new benchmark demo, and some more small changes