Combo
merge game.cpp
minor changes