Adding a new demo and cleaning up a bug