took stuff out so could publish, added some stuff for demos.