server improvements