more menu stuff and typos