comments and cleanup
new fields for filtering events