fixed events... finally