Incidents number and timing tidy up

I tidied up that stuff we discussed. I should have split it out into discrete commits so you could see the process - next time :)