Improve demo and update documentation for greater clarity