Made some tweaks for the demo, and added some helper functions. Also mad...

...e things case insensitive for now