Made a few adjustments to accommodate the new display for TM1 data.