Fixed some problems with the client, Made the dict more meaning full