Another threesome + small fixes
Merge branch 'master' of https://github.com/Wahn128/Flexible-Survival