update so fdr easier to work w
added support to generate figures 6 and 7