Fnal2

Hi Lucien,

Thank you very much for the fnal branch.  Here is a pull request, into the branch fnal, that has a few clarifications, simplifications, and fixes.  I have tested it at both FNAL and IC.  If it looks ok to you, then please merge this PR, and subsequently merge PR #304 (fnal into master).

Ted