Improve onboarding process
Bug fixes and general improvements