change XXX comments to NOTE, which is what they are