i added additional logging and other few small changes.