Various trek template improvements