Improve demo scripts and documentation