Fixed menu and semantics (hopefully).