diff --git a/pkg/display/display.go b/pkg/display/display.go
index b838e3e..75da55c 100644
--- a/pkg/display/display.go
+++ b/pkg/display/display.go
@@ -1,3 +1,4 @@
+// pkg/display/display.go
 package display
 
 import (
diff --git a/pkg/menu/messages.go b/pkg/menu/messages.go
index 61c8de5..bd4eb40 100644
--- a/pkg/menu/messages.go
+++ b/pkg/menu/messages.go
@@ -1,3 +1,4 @@
+// pkg/menu/messages.go
 package menu
 
 // QueryConfig requests this service's config section from the display orchestrator.
diff --git a/pkg/menu/mock_platform.go b/pkg/menu/mock_platform.go
index 02b1236..7f44a47 100644
--- a/pkg/menu/mock_platform.go
+++ b/pkg/menu/mock_platform.go
@@ -1,3 +1,4 @@
+// pkg/menu/mock_platform.go
 package menu
 
 // MockPlatform is an exported mock for cross-package integration tests.
@@ -5,15 +6,19 @@ type MockPlatform struct{}
 
 func NewMockPlatform() *MockPlatform { return &MockPlatform{} }
 
-func (m *MockPlatform) NewMenu() PlatformMenu             { return &exportedMockPlatformMenu{} }
+func (m *MockPlatform) NewMenu() PlatformMenu                { return &exportedMockPlatformMenu{} }
 func (m *MockPlatform) SetApplicationMenu(menu PlatformMenu) {}
 
 type exportedMockPlatformMenu struct{}
 
-func (m *exportedMockPlatformMenu) Add(label string) PlatformMenuItem { return &exportedMockPlatformMenuItem{} }
-func (m *exportedMockPlatformMenu) AddSeparator()                     {}
-func (m *exportedMockPlatformMenu) AddSubmenu(label string) PlatformMenu { return &exportedMockPlatformMenu{} }
-func (m *exportedMockPlatformMenu) AddRole(role MenuRole)             {}
+func (m *exportedMockPlatformMenu) Add(label string) PlatformMenuItem {
+	return &exportedMockPlatformMenuItem{}
+}
+func (m *exportedMockPlatformMenu) AddSeparator() {}
+func (m *exportedMockPlatformMenu) AddSubmenu(label string) PlatformMenu {
+	return &exportedMockPlatformMenu{}
+}
+func (m *exportedMockPlatformMenu) AddRole(role MenuRole) {}
 
 type exportedMockPlatformMenuItem struct{}
 
diff --git a/pkg/menu/register.go b/pkg/menu/register.go
index acb4b88..4138deb 100644
--- a/pkg/menu/register.go
+++ b/pkg/menu/register.go
@@ -1,3 +1,4 @@
+// pkg/menu/register.go
 package menu
 
 import "forge.lthn.ai/core/go/pkg/core"
diff --git a/pkg/menu/service.go b/pkg/menu/service.go
index 2e8ac26..8028149 100644
--- a/pkg/menu/service.go
+++ b/pkg/menu/service.go
@@ -1,3 +1,4 @@
+// pkg/menu/service.go
 package menu
 
 import (
diff --git a/pkg/systray/messages.go b/pkg/systray/messages.go
index 46da75d..9507a88 100644
--- a/pkg/systray/messages.go
+++ b/pkg/systray/messages.go
@@ -1,3 +1,4 @@
+// pkg/systray/messages.go
 package systray
 
 // QueryConfig requests this service's config section from the display orchestrator.
diff --git a/pkg/systray/mock_platform.go b/pkg/systray/mock_platform.go
index 7c126e0..32e2362 100644
--- a/pkg/systray/mock_platform.go
+++ b/pkg/systray/mock_platform.go
@@ -1,3 +1,4 @@
+// pkg/systray/mock_platform.go
 package systray
 
 // MockPlatform is an exported mock for cross-package integration tests.
diff --git a/pkg/systray/register.go b/pkg/systray/register.go
index b4d133b..01b625f 100644
--- a/pkg/systray/register.go
+++ b/pkg/systray/register.go
@@ -1,3 +1,4 @@
+// pkg/systray/register.go
 package systray
 
 import "forge.lthn.ai/core/go/pkg/core"
diff --git a/pkg/webview/diagnostics.go b/pkg/webview/diagnostics.go
index 60afb7f..55c0113 100644
--- a/pkg/webview/diagnostics.go
+++ b/pkg/webview/diagnostics.go
@@ -1,3 +1,4 @@
+// pkg/webview/diagnostics.go
 package webview
 
 import (
diff --git a/pkg/window/messages.go b/pkg/window/messages.go
index e517e0c..6146ac2 100644
--- a/pkg/window/messages.go
+++ b/pkg/window/messages.go
@@ -87,7 +87,8 @@ type TaskSetPosition struct {
 type TaskSetSize struct {
 	Name          string
 	Width, Height int
-	W, H          int
+	// W and H are compatibility aliases for older call sites.
+	W, H int
 }
 
 // TaskMaximise maximises a window.
@@ -244,7 +245,8 @@ type ActionWindowMoved struct {
 type ActionWindowResized struct {
 	Name          string
 	Width, Height int
-	W, H          int
+	// W and H are compatibility aliases for older listeners.
+	W, H int
 }
 
 // ActionWindowFocused is broadcast when a window gains focus.
diff --git a/pkg/window/mock_platform.go b/pkg/window/mock_platform.go
index 642de83..89146fb 100644
--- a/pkg/window/mock_platform.go
+++ b/pkg/window/mock_platform.go
@@ -1,3 +1,4 @@
+// pkg/window/mock_platform.go
 package window
 
 // MockPlatform is an exported mock for cross-package integration tests.
@@ -76,12 +77,12 @@ func (w *MockWindow) Close() {
 	w.closed = true
 	w.emit(WindowEvent{Type: "close", Name: w.name})
 }
-func (w *MockWindow) Show()                                { w.visible = true }
-func (w *MockWindow) Hide()                                { w.visible = false }
-func (w *MockWindow) Fullscreen()                          {}
-func (w *MockWindow) UnFullscreen()                        {}
-func (w *MockWindow) OpenDevTools()                        {}
-func (w *MockWindow) CloseDevTools()                       {}
+func (w *MockWindow) Show()          { w.visible = true }
+func (w *MockWindow) Hide()          { w.visible = false }
+func (w *MockWindow) Fullscreen()    {}
+func (w *MockWindow) UnFullscreen()  {}
+func (w *MockWindow) OpenDevTools()  {}
+func (w *MockWindow) CloseDevTools() {}
 func (w *MockWindow) OnWindowEvent(handler func(WindowEvent)) {
 	w.eventHandlers = append(w.eventHandlers, handler)
 }
diff --git a/pkg/window/register.go b/pkg/window/register.go
index a00bc17..b0b1a70 100644
--- a/pkg/window/register.go
+++ b/pkg/window/register.go
@@ -1,3 +1,4 @@
+// pkg/window/register.go
 package window
 
 import "forge.lthn.ai/core/go/pkg/core"
diff --git a/pkg/window/service.go b/pkg/window/service.go
index b631202..b6dbe1d 100644
--- a/pkg/window/service.go
+++ b/pkg/window/service.go
@@ -582,6 +582,7 @@ func (s *Service) primaryScreenSize() (int, int) {
 }
 
 // Manager returns the underlying window Manager for direct access.
+// Use: mgr := svc.Manager()
 func (s *Service) Manager() *Manager {
 	return s.manager
 }