multiple servers allowed and minor changes to client