fixes in Friendship Model