Updated more commenting.