Improve PRTClient and csfterm