event changes

fixed strange eventing within Celia and others during first fight