Added automatic phone friend,
multiple refactorings