Ok, I believe I have fixed all the suggestions offered by Francois (thanks!).

Please see what you think of this updated patch.  The changes have
been compile tested...and will pass some data in just a few minutes to
make sure nothing funny happens...

Thanks,
Ben

-- 
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc  http://www.candelatech.com