merge fixes and init a random seed so that stuff like playerstarts can be truly randomized