Pulled in the useful modifications I did during the tryphon tests.