Attempt to add comments part 1, plus a bunch of small fixes
Fixed merge
merged challenges.html