Fix missed events
Fix on-screen calculation
Use single debug definition