more fixes for Dakota's Server/Client question on 142 Final