Removed extra friends, fixed bugs