some minor changes to server contr