More documentation
Minor cleanup