(final?) commenting changes