the game initialized more properly from a client server perspective
minor merge conflict fixed still needs units to be assigned