Updated json objects passed to client

Bryan asked for some changes.  These were doable.