Added more waves (including noise) and fixed ADC