various changes to demo