Some bug fixes and a Demo App