Minor tweaks to EZ demo and wrapper

see commends in code comment block