additional logging added; warnings removed;