Tidying up bugs + started user onboarding