Fixed issues i could foresee, not able to test till early launch