Fixed some bugs and now need further test