Attempt to integrate ADCs (untested); formatting fixes