Todo tweaking [Ready for merge]

Blank_Altrequested to merge
Blank_Alt/fc-pregmod:TODO-tweaking into pregmod-master

Closes #1120 (closed).

Edited by Blank_Alt

Merge request reports