Bug fix for fb reconstruction

Code now more accurately reflects our objective function
Merge branch 'fb_fixes'