fixed some merge errors for multiconnection to work properly.