other tweaks to server class