re-working events and a few other small changes