some clean up and adjusted some ADC stuff