Remaining time

This is really three pull requests in one...

* RemainingTime
* TimingsConfig
* StateCollectionIncorrect

The TimingsConfig and StateCollectionIncorrect requests were open for so long that they have both been merged into RemainingTime already, making this one massive request.