Another way of improvement could be the marshals. I'm not sure what kind of training they receive, but there must be better on the spot judgement of situations like this. There was clearly very dangerous situation at that corner, and some kind of higher level alert should have been deployed, especially when it rains.