some fixes plus add support for server configs