Fixes and options additions to FDR advance calc
Relocation of matrix to TT matrix