making small changes to add construction of subset of entries for each client, and other small details.