Add Duoshi and deal with some bugs