window -> overlay for overlays; add missing entities