1) Added bunch of non-core events as entitlements, 2) reverted some useful filters which were mistakenly removed, 3) refactored code