cleanup the demo a bit... add a few more things