Corrected packages and filled out clients and sockets