Fixes to friends

Should be fully working now...hopefully