Some logging and and CID Number normalization added.