Edits from Brian, clarifications from Leslie's tests