clean up some junk
Add Oscillator (needs specs)