Added remaining comments