MAD removal

Code still used the MAD in one place. Removed this, and changed the
stuff printed to the screen to correctly refer to the STD. Also
commented out the similar ref plotting, for the time-being.