Minor changes in documentation, and clean up