diff --git a/internal/model/trace.go b/internal/model/trace.go
index 570f76a0..3a8ecb0f 100644
--- a/internal/model/trace.go
+++ b/internal/model/trace.go
@@ -30,6 +30,7 @@ type HandshakeTracer interface {
 	OnHandshakeDone(remoteAddr string)
 
 	// Trace returns an array of [HandshakeEvent]s.
+	// TODO -- remove the Trace() method -------------------------------
 	Trace() []HandshakeEvent
 }
 
@@ -63,6 +64,7 @@ func (e HandshakeEventType) String() string {
 }
 
 // HandshakeEvent must implement the event annotation methods, plus json serialization.
+// TODO: this is easier as a struct
 type HandshakeEvent interface {
 	Type() HandshakeEventType
 	Time() time.Time
diff --git a/internal/model/vpn_options.go b/internal/model/vpnoptions.go
similarity index 100%
rename from internal/model/vpn_options.go
rename to internal/model/vpnoptions.go
diff --git a/internal/tracex/trace.go b/internal/tracex/trace.go
index 05793874..c3f5ebb0 100644
--- a/internal/tracex/trace.go
+++ b/internal/tracex/trace.go
@@ -128,7 +128,7 @@ func (t *Tracer) OnHandshakeDone(remoteAddr string) {
 func (t *Tracer) Trace() []model.HandshakeEvent {
 	t.mu.Lock()
 	defer t.mu.Unlock()
-	return t.events
+	return append([]model.HandshakeEvent{}, t.events...)
 }
 
 func logPacket(p *model.Packet, retries int, direction model.Direction) optional.Value[model.LoggedPacket] {