rc6 -- Logging fix, better clean-up

Version V1 V2  
1 by John B. Cole View Revision