fixed some bugs after friends report
fixed some bugs after friends report