Improved two client suite a bit.