97 TJ surging at 1600 -2000 rpms

i have scanned the threads and not found the same issue. i have a 97 TJ sport auto 4.0. while running up to speed the engine surges (about 200-300rpm drops) and tends to smooth out once past 2000-2200 rpms. once at cruising speed i feel a slight miss but not consistent. i did have a code come for o2 sensor, had it cleared and it has not come back. any thoughts