Added flag for timestamps and limiting to certain events