debug and cleanup, better server_info