prepare for demo, fixed bugs: module issue, naming confliction