fixed some bugs in the fit writer

Also included query to include all of B-R fight