Attempt to address Alex's comments on the pre-FPWD draft
Merge AVT/TVT changes into this draft
Merge pull request #126 from ndw/alex-review-20141203

Alex's review comments on the proposed FPWD.