fixed some bugs again