Welcome/confirmation tweaks

Also changes the header, while keeping the other code around in case we want to fix it later.