Little more cleaned, added some events.