More commenting work