Add to and clean up documentation