a few fixes to the server handling with config and so forth