made some changes in client to make it better match up. still a lot to be done