Switched to faster measurement constructor where possible
Improved measurement constructor performance
Fixed ITC error printing past terminator