Better comments and references.