Added defaults, improve demo