adding and fixing existing event handlers (just did ADC)