First round of overhauls. Generalized language, established a quick interim menu.