A few more edits to allow for n-array etrain variables,
rather then just floats.