Add ability to add trace data to timeout messages
Bug fix in exception - so not usual bug to hit
Documentation updates
reformatting