Make a few improvements and add some references.