fixed some stuff
fixed find friends conflict