improved demo, extended evaluation code, created stats