And like you said as for the stalling issue, clean your MAF with MAF cleaner and take off and clean your throttle body.