server should now handle timeouts correctly
server should handle timeouts properly