Bunch of updates at 2 which fixes cors and socket io cors