Almost final edits to welcome and rpi1