first batch of zombie mod bug fixes