Fixed friend relationships and added comments