Major Changes

waveform renamed, cleanup, some changes