added waves, wavebutton, and wavechanging
took out annoying error messages (merge conflicts)