Fix bugs and update documentation
Improve demo