tweaks to Clients; various cleanup