More commenting updates