Afb branch

Merging in a few changes to the AFB code. These are additions only, and shouldn't affect anyone outside the AFB analysis.