Friendslist fixes. Almost done