A number of tweaks from iterating with the Transport Testing Tool (http://transport-testing.nist.gov/ttt/)