(+) Add: Improvements to the challenge client/server