Added Event Filtering and minor fixes and additions