some bugs again

fixed