enhancements to comments and docstrings