Appendix 1 completed. Closes #150, closes #148, and and fixes #87.