Finish onboarding logic. fixes #197, fixes #127