fix bugs & make a demo