monitor other types of events and a lot of fixes