Bug fixes, enable export for time series