Add missing waveform
Remove unused method
Change variable type
Update submodule