Comments and a fix.