update 2

fixed some bugs