some more cleaning up of the CE finding and updating code