Added untagged time series code, bug fixes