Some minor edits, many in Josiah's part (jba)