Wording and whatnot

Also hide a might-be change until it's really implemented.