TODO outputs + small comment change