Added remaining comments.