1.2.3 Build 2

Fixed and improved survival functions from build 1; Fixed some bugs