updated client side data handling. simplified server some. plugging along