misc demo changes

misc changes