Fixing comments box, and a couple other things.