lots of fixes for cultess divergence branch
fixed find friends conflict