Update for the Client

Just a few upgrades