Fixed a couple of friends bugs

92% complete