Fixed some bugs with choosing friends