More commenting and an actual real bug fix