Fix several bugs including survivor count display bugs