Fixed logging. added more events