waveform: remove commented out struct definitions
options: use named options errors, for testing; use fmt.Sprintf instead of string concatenation