wanted+ + fixes