updates
address a suggestion
updates to Client