socket collection improvements