ammend server stop and ensure s2s works properly