Multiple oscs, removed checkbox, selector for controlling waves