Add/extend comments and docstrings