More comments, broke and fixed again