Text editions + rewrote discussion
 * Updated ordering of tables/figures