Add some extra info, trying not_in_menu.
Move _goals back to goals.