Quick updates to make configuration simpler. Update demo.