Mar 17th

fix some bugs