- fixed some bugs for the demo