FIX: mixup of events/epochs fixed + addressed alex's comments