Final cleanups before group review. Only Appendix B Figure is pending...