Bug fix (and v. && -- TIL), and add more menu selections