updating some socket stuff
resolving conflicts