Added argument parsing for the client, fixed server.