tweaked a couple of pieces for onboarding