more server improvments