tryed to fix some bugs

tryed to fix the wanted list +