Fixes and tweaks

brickoderequested to merge
(removed):hotfixes into pregmod-master

Trying to fix the NaNs in #590 (closed), but I'm not having much luck.

Merge request reports