Add trial ID and improve drop_epochs: cosmetics + fix