-some commenting changes.