minor tweaks to demo
16 and 17 done