more tweaks to server