Updates to documentation/comments and CHANGES.rst