Restore wiped note about random name using '?' key

 and some other tweaks.