fixes to align calcualtion for EP... adds SO to hash, handles multiple numerators in grouping, and switches temporals pointing to MP start or end