bolt to work for any format & some socket cleanup checkin