Redid the demo content and a few other things