Bug fixes, and changes to time series object