Added option to use a subset of the timepoints
Fixed affine.