Comments and final changes.