Re-arranged figure to reflect order in text
Small text changes, closes #21, closes #23