Various updates to event handling and added minimal reader validation