Added back some comments that were lost in the last commit