some more server changes