Bug fixes.

This all seems to be working- I'm in the middle of processing the FIA results that were buggy, and they are actually processing now.