Compare lags to number of iterations

Otherwise, an error was generated: now it's only a warning, we
plot as far as we can.
Merge branch 'here'