tweak timeout logic
better restart logic
better JSON failures