improve server & connection