Cleanup and some event documentation