tweaks to server comm code