some changes

fixed some bugs