Clean out your IAC valve inside the throttle body. It's the only thing that controls your idle. You should clean your MAFS while you're at it, too.
As for the CEL, you can either do this to eliminate it:
Or pick up a TPR CAI
(based off of the above mod, but more powerful).