Added friends and other fixes