More cleanup; cleaned up schema sections of appendix.