Fixing the demos and cleaning up all the other fun stuff