Comments and a little rename.