lots of changes :p

makeover of events etc