Some fixes and additions to the "welcome" example