Various Fixes
Merge branch 'master' of https://github.com/BlueBishop/Flexible-Survival