lots of small changes made for rev 1 demo