Updates to agree with recent changes to JOM
Some enhancements to the demo