many server fixes