tryed to fix some bugs