plague spreading logic
plague spreading functional
minor merge fixes