refs #2 - some improvements handling multiple clients on same host