Edits + Tom's comments on .pdf