indmar 340 cat cold idle hunting

Like the title says. Cold idle moves up and down on cold start up. Prob between say 7 and 900 rpms for instance. If I head out it will continue this hunting up until about 1700 rpms , around 2200 it will stop the hunting and smooth out. Once the coolant temp is up to 160 all this goes away and I have a very smooth 600 rpm idle with no more hunting ( the rpms are not exacts but close examples)
It seems to be getting a little worse.
I'm going to remove and clean the air filter and remove and clean the Throttlebody and inspect the maf.
Just wondering if anyone else has experienced this and what did you do ?