Population fix

Jonesrequested to merge
Jones/fc-pregmod:BabyFix into pregmod-master

I disagree with past me about some choices, they were inconsistent, so I changed them. Also just some minor fixes etc.

Merge request reports