Fix startup, more work on lobby