Reuse trajlist
Tidy up
Fixed return values
Tex initial commit