fixed some calls to events (logging2 still in progress)