Wtc dev

William Clarkerequested to merge
wtcDev into master

Various fixes and improvements - trying out merge requests.

Merge request reports