new demo project complete, rolled in a few bug fixes too