Unlasting Horror: fixes and improvements

fixes and improvements