fail fast implementation cmplete
Server made more robust
cosmetics