More cleanup - hit some other issues with the length of processing, and at times not returning a result code.  Fixed