completely refactored time series into CTEs, disc_counts has curterm fields, cleaned up MAP on reporting