new menu, cleaner entity management, OSC verification