more
different wave types
rename variables and move some stuff