Some more work on documentation