Additional documentation, and minor name changes