Finished the demo and handled some bug.