Fixing WaveformReader

Trying to get WaveformReader to show read something other than always 0. Tryingto manipulate the iterator in a way that is not too slow.