Another portion of fixes and changes to early the draft of FSRL