Fixed demo, cleaned up unneeded commented sections

Not much to say about this commit. I should really think more before commiting stuff. Git's spoiling me.