Incorporating Justin's comments from issue #1