Minor edits, event logging is broken