Add more demo material, fix bugs