refs #823 - some trail saving improvements