Resolved a bug with judith storage class.

Also added improvements to the waveform analysis.