Fixed bug with client connection, added client ids.