Improve the demos & docs