add waves and fixes
add third color for spectrum
merge