Making survival hard and bugfixes