minor changes; potentially final version of the demo