Added a bit more stuff, and changed demos to showcase.