fixing bugs
merge
trying to fix create game