marginal improvements - still no automated client constructor.