fixed packet loss possibility on friend request event

also a little tidying up