demo completed with bugs (could only run once :p)

demo completed with bugs (could only run once :p)