Clean up variable names.
Add output of freq waves.