re-doing figures, and updating the demo slightly