Fixing up demo, adding readme
Some minor improvements