Fixes and logging enhancement.  Example half complete