Cosmetic changes
docstring updates
more logging ...