Fixing a bunch of agent and client mistakes
Increase version