Fixing graphical output, and adding a demo2 file