Fix naming bugs with primary diagnosis - now saves.
Fix some display bugs with secondary diagnosis.

refs #363