Made client slightly more usable