Updated pf.tex, removed comments, consolidated with discussion.tex